diff --git a/src/Login.php b/src/Login.php
index 5fe1f48961..7c276c538d 100644
--- a/src/Login.php
+++ b/src/Login.php
@@ -161,12 +161,10 @@
             <div class="form-group has-feedback">
                 <input type="text" id="UserBox" name="User" class="form-control" value="<?= $urlUserName ?>"
                        placeholder="<?= gettext('Email/Username') ?>" required autofocus>
-                <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
             </div>
             <div class="form-group has-feedback">
-                <input type="password" id="PasswordBox" name="Password" class="form-control"
+                <input type="password" id="PasswordBox" name="Password" class="form-control" data-toggle="password"
                        placeholder="<?= gettext('Password') ?>" required autofocus>
-                <span class="glyphicon glyphicon-lock form-control-feedback"></span>
                 <br/>
                 <?php if (SystemConfig::getBooleanValue('bEnableLostPassword')) {
             ?>
@@ -193,7 +191,14 @@ class="fa fa-user-plus"></i> <?= gettext('Register a new Family'); ?></a><br>
         <!--<a href="external/family/verify" class="text-center">Verify Family Info</a> -->
 
     </div>
-    <!-- /.login-box-body -->
+<script>
+    $('#password').password('toggle');
+    $("#password").password({
+        eyeOpenClass: 'glyphicon-eye-open',
+        eyeCloseClass: 'glyphicon-eye-close'
+})    
+</script>
+<!-- /.login-box-body -->
 </div>
 <!-- /.login-box -->