diff --git a/api/register.php b/api/register.php
index d4e21fc7..eead3401 100644
--- a/api/register.php
+++ b/api/register.php
@@ -14,10 +14,7 @@
     $password = $_POST['password'];
     $confirm_password = $_POST['confirm_password'];
 
-    $ip = $_SERVER['REMOTE_ADDR'];
-    if (!filter_var($ip, FILTER_VALIDATE_IP)) {
-        $ip = "0.0.0.0";
-    }
+    $ip = $utility->checkIp();
 
     $getSettings = $database->prepare('SELECT * FROM settings WHERE active = 1');
     $getSettings->execute();
diff --git a/pages/client/profile/edit.php b/pages/client/profile/edit.php
index 1f13d146..ed06a5d2 100644
--- a/pages/client/profile/edit.php
+++ b/pages/client/profile/edit.php
@@ -247,7 +247,7 @@ function(data){
                     </p>
                 </div>
                 <div class="panel-footer">
-                    <button data-toggle="modal" data-target="#con-close-modal" type="button"  class="btn btn-warning btn-custom waves-effect w-md waves-light m-b-5">Change password</button>
+                    <button data-toggle="modal" data-target="#PasswordChange" type="button"  class="btn btn-warning btn-custom waves-effect w-md waves-light m-b-5">Change password</button>
                     <button type="button" class="btn btn-success btn-custom waves-effect w-md waves-light m-b-5" onclick="saveUser()">Save</button>
                 </div>
             </div>
@@ -255,7 +255,7 @@ function(data){
     </div>
 </div>
 
-<div id="con-close-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
+<div id="PasswordChange" class="modal fade" role="dialog" style="display: none;">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
@@ -331,7 +331,7 @@ function(data){
 <script src="/assets/js/jquery.core.js"></script>
 <script src="/assets/js/jquery.app.js"></script>
 
-<script src="/assets/plugins/custombox/dist/custombox.min.js"></script>
+<script src="../../assets/plugins/custombox/dist/custombox.min.js"></script>
 <script src="/assets/plugins/custombox/dist/legacy.min.js"></script>