diff --git a/admin/index.php b/admin/index.php
index d5d02c65..87255fa8 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 
 header('location: ../index.php?_route=admin/');
\ No newline at end of file
diff --git a/docs/diskusi.html b/docs/diskusi.html
index de7b11d3..3eb824ef 100644
--- a/docs/diskusi.html
+++ b/docs/diskusi.html
@@ -51,7 +51,7 @@
                 <div id="disqus_thread"></div>
                   <script>
                     var disqus_config = function () {
-                    this.page.url = "https://ibnux.github.io/phpnuxbill/diskusi.html";  // Replace PAGE_URL with your page's canonical URL variable
+                    this.page.url = "https://github.com/hotspotbilling/phpnuxbill/diskusi.html";  // Replace PAGE_URL with your page's canonical URL variable
                     this.page.identifier = "phpnuxbill"; // Replace PAGE_IDENTIFIER with your page's unique identifier variable
                     };
                     (function() { // DON'T EDIT BELOW THIS LINE
diff --git a/index.php b/index.php
index a50c1646..8686af78 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 
 require ('system/boot.php');
diff --git a/install/step4.php b/install/step4.php
index 42074322..306d3b15 100644
--- a/install/step4.php
+++ b/install/step4.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 //error_reporting (0);
 $appurl = $_POST['appurl'];
diff --git a/system/autoload/Admin.php b/system/autoload/Admin.php
index 936aa198..fd406a70 100644
--- a/system/autoload/Admin.php
+++ b/system/autoload/Admin.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 
 Class Admin{
diff --git a/system/autoload/App.php b/system/autoload/App.php
index ece6cec4..cac41db2 100644
--- a/system/autoload/App.php
+++ b/system/autoload/App.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 
 Class App{
diff --git a/system/autoload/Http.php b/system/autoload/Http.php
index 058a9581..0fd4da2b 100644
--- a/system/autoload/Http.php
+++ b/system/autoload/Http.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  **/
 
 class Http
diff --git a/system/autoload/Lang.php b/system/autoload/Lang.php
index 33bbc3c0..f5e08e60 100644
--- a/system/autoload/Lang.php
+++ b/system/autoload/Lang.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  **/
 
 class Lang {
diff --git a/system/autoload/Package.php b/system/autoload/Package.php
index d890e6f0..53c87a46 100644
--- a/system/autoload/Package.php
+++ b/system/autoload/Package.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  **/
 
 
diff --git a/system/autoload/Paginator.php b/system/autoload/Paginator.php
index 64133024..97553cd8 100644
--- a/system/autoload/Paginator.php
+++ b/system/autoload/Paginator.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 
 Class Paginator
diff --git a/system/autoload/Password.php b/system/autoload/Password.php
index b176b5af..75708285 100644
--- a/system/autoload/Password.php
+++ b/system/autoload/Password.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 
  **/
 
diff --git a/system/autoload/Timezone.php b/system/autoload/Timezone.php
index 4c810448..b99f3d18 100644
--- a/system/autoload/Timezone.php
+++ b/system/autoload/Timezone.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 
 class Timezone {
diff --git a/system/autoload/User.php b/system/autoload/User.php
index c911026e..68ebbf55 100644
--- a/system/autoload/User.php
+++ b/system/autoload/User.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 
 Class User{
diff --git a/system/autoload/Validator.php b/system/autoload/Validator.php
index 0eabcea7..4cc364d4 100644
--- a/system/autoload/Validator.php
+++ b/system/autoload/Validator.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 
 /**
diff --git a/system/boot.php b/system/boot.php
index 320d08ec..01c4d67c 100644
--- a/system/boot.php
+++ b/system/boot.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 
  **/
 session_start();
diff --git a/system/controllers/accounts.php b/system/controllers/accounts.php
index 7f79517f..8c93dedf 100644
--- a/system/controllers/accounts.php
+++ b/system/controllers/accounts.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 _auth();
 $ui->assign('_title', $_L['My_Account']);
diff --git a/system/controllers/admin.php b/system/controllers/admin.php
index eaa6d44d..d7b98bf8 100644
--- a/system/controllers/admin.php
+++ b/system/controllers/admin.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  **/
 if (isset($routes['1'])) {
     $do = $routes['1'];
diff --git a/system/controllers/autoload.php b/system/controllers/autoload.php
index 854ca15f..7d545b4d 100644
--- a/system/controllers/autoload.php
+++ b/system/controllers/autoload.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 * used for ajax
 **/
 
diff --git a/system/controllers/bandwidth.php b/system/controllers/bandwidth.php
index 80c036be..a8c23bdc 100644
--- a/system/controllers/bandwidth.php
+++ b/system/controllers/bandwidth.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 _admin();
 $ui->assign('_title', $_L['Bandwidth_Plans']);
diff --git a/system/controllers/callback.php b/system/controllers/callback.php
index 29a954d4..e15fa83a 100644
--- a/system/controllers/callback.php
+++ b/system/controllers/callback.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  **/
 
 $action = $routes['1'];
diff --git a/system/controllers/community.php b/system/controllers/community.php
index bdf947d3..0a175f39 100644
--- a/system/controllers/community.php
+++ b/system/controllers/community.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 _admin();
 $ui->assign('_title', 'Community');
diff --git a/system/controllers/customers.php b/system/controllers/customers.php
index db248597..8f412fed 100644
--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 
  **/
 _admin();
diff --git a/system/controllers/dashboard.php b/system/controllers/dashboard.php
index 33289dcb..320ac76e 100644
--- a/system/controllers/dashboard.php
+++ b/system/controllers/dashboard.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 _admin();
 $ui->assign('_title', $_L['Dashboard']);
diff --git a/system/controllers/default.php b/system/controllers/default.php
index 90d9f5b6..fb93515f 100644
--- a/system/controllers/default.php
+++ b/system/controllers/default.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 
 r2(APP_URL.'/index.php?_route=dashboard');
diff --git a/system/controllers/export.php b/system/controllers/export.php
index 0d528539..5407afa3 100644
--- a/system/controllers/export.php
+++ b/system/controllers/export.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 _admin();
 $ui->assign('_title', $_L['Reports']);
diff --git a/system/controllers/home.php b/system/controllers/home.php
index dc020e83..edb65fee 100644
--- a/system/controllers/home.php
+++ b/system/controllers/home.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  **/
 _auth();
 $ui->assign('_title', $_L['Dashboard']);
diff --git a/system/controllers/login.php b/system/controllers/login.php
index e7dcb74e..e5dfd299 100644
--- a/system/controllers/login.php
+++ b/system/controllers/login.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 
  **/
 
diff --git a/system/controllers/logout.php b/system/controllers/logout.php
index 2a2620f1..cd802ff5 100644
--- a/system/controllers/logout.php
+++ b/system/controllers/logout.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 run_hook('customer_logout'); #HOOK
 if (session_status() == PHP_SESSION_NONE) session_start();
diff --git a/system/controllers/order.php b/system/controllers/order.php
index 0e889e94..db4b5679 100644
--- a/system/controllers/order.php
+++ b/system/controllers/order.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  **/
 _auth();
 $action = $routes['1'];
diff --git a/system/controllers/page.php b/system/controllers/page.php
index 3396909f..df4876c0 100644
--- a/system/controllers/page.php
+++ b/system/controllers/page.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 _auth();
 $ui->assign('_title', $_L['Order_Voucher']);
diff --git a/system/controllers/pages.php b/system/controllers/pages.php
index efae82fe..53031d22 100644
--- a/system/controllers/pages.php
+++ b/system/controllers/pages.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 _admin();
 $ui->assign('_title', 'Pages');
diff --git a/system/controllers/paymentgateway.php b/system/controllers/paymentgateway.php
index 47732e0d..89fc60e5 100644
--- a/system/controllers/paymentgateway.php
+++ b/system/controllers/paymentgateway.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 _admin();
 $ui->assign('_system_menu', 'paymentgateway');
diff --git a/system/controllers/pool.php b/system/controllers/pool.php
index a8e89648..f46fd039 100644
--- a/system/controllers/pool.php
+++ b/system/controllers/pool.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  **/
 _admin();
 $ui->assign('_title', $_L['Network']);
diff --git a/system/controllers/prepaid.php b/system/controllers/prepaid.php
index 24425373..90fe7b93 100644
--- a/system/controllers/prepaid.php
+++ b/system/controllers/prepaid.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  * @copyright	Copyright (C) 2014-2015 PHP Mikrotik Billing
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
 
diff --git a/system/controllers/register.php b/system/controllers/register.php
index d2415bbc..8a8c11ac 100644
--- a/system/controllers/register.php
+++ b/system/controllers/register.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
  * @copyright	Copyright (C) 2014-2015 PHP Mikrotik Billing
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  *
diff --git a/system/controllers/reports.php b/system/controllers/reports.php
index 38aaf22b..8c426eb7 100644
--- a/system/controllers/reports.php
+++ b/system/controllers/reports.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 _admin();
 $ui->assign('_title', $_L['Reports']);
diff --git a/system/controllers/routers.php b/system/controllers/routers.php
index b95fe929..26aa90dd 100644
--- a/system/controllers/routers.php
+++ b/system/controllers/routers.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 _admin();
 $ui->assign('_title', $_L['Network']);
diff --git a/system/controllers/services.php b/system/controllers/services.php
index 6b912fed..35137f82 100644
--- a/system/controllers/services.php
+++ b/system/controllers/services.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 
  **/
 _admin();
diff --git a/system/controllers/settings.php b/system/controllers/settings.php
index 5c93b544..13940b82 100644
--- a/system/controllers/settings.php
+++ b/system/controllers/settings.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 
  **/
 _admin();
diff --git a/system/controllers/voucher.php b/system/controllers/voucher.php
index 49a74a02..65704807 100644
--- a/system/controllers/voucher.php
+++ b/system/controllers/voucher.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 
  **/
 _auth();
diff --git a/system/cron.php b/system/cron.php
index e1fb722b..84204db7 100644
--- a/system/cron.php
+++ b/system/cron.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 
 require('../config.php');
diff --git a/system/radius.php b/system/radius.php
index 65b0100b..174a862a 100644
--- a/system/radius.php
+++ b/system/radius.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* PHP Mikrotik Billing (https://ibnux.github.io/phpnuxbill/)
+* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/
 
 if(php_sapi_name() !== 'cli'){