diff --git a/add_login_modal.php b/add_login_modal.php
index 53fc4d48..e0b25e15 100644
--- a/add_login_modal.php
+++ b/add_login_modal.php
@@ -68,7 +68,10 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
                   </div>
-                  <input type="text" class="form-control" name="otp_secret" placeholder="Insert secret key">
+                  <input type="password" class="form-control" data-toggle="password" name="otp_secret" placeholder="Insert secret key">
+                  <div class="input-group-append">
+                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                  </div>
                 </div>
               </div>
 
diff --git a/add_software_modal.php b/add_software_modal.php
index 10ef8ddd..ed5b45b2 100644
--- a/add_software_modal.php
+++ b/add_software_modal.php
@@ -90,7 +90,10 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                   </div>
-                  <input type="text" class="form-control" name="password" placeholder="Password">
+                  <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password">
+                  <div class="input-group-append">
+                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                  </div>
                 </div>
               </div>
             
diff --git a/edit_login_modal.php b/edit_login_modal.php
index 8f56bfdf..c96636c1 100644
--- a/edit_login_modal.php
+++ b/edit_login_modal.php
@@ -71,7 +71,10 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
                   </div>
-                  <input type="text" class="form-control" name="otp_secret" value="<?php echo $login_otp_secret; ?>" placeholder="Insert secret key">
+                  <input type="password" class="form-control" data-toggle="password" name="otp_secret" value="<?php echo $login_otp_secret; ?>" placeholder="Insert secret key">
+                  <div class="input-group-append">
+                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                  </div>
                 </div>
               </div>
 
diff --git a/edit_software_modal.php b/edit_software_modal.php
index aec746e2..8fe514ae 100644
--- a/edit_software_modal.php
+++ b/edit_software_modal.php
@@ -90,12 +90,17 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                   </div>
-                  <input type="text" class="form-control" name="password" placeholder="Password" value="<?php echo $login_password; ?>">
+                  <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password" value="<?php echo $login_password; ?>">
+                  <div class="input-group-append">
+                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                  </div>
                 </div>
               </div>
             
             </div>
 
+          </div>
+
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>