diff --git a/ui/src/app/login/controllers/LoginCtrl.js b/ui/src/app/login/controllers/LoginCtrl.js
index f633ef01..1f4fe2ca 100755
--- a/ui/src/app/login/controllers/LoginCtrl.js
+++ b/ui/src/app/login/controllers/LoginCtrl.js
@@ -6,6 +6,7 @@
 
   function LoginCtrl($scope, $state, UserService) {
     $scope.user = {};
+    $scope.inputType = 'password';
     $scope.login = function(){
       $scope.incorrectCredentials = false;
       $scope.unApproved = false;
@@ -17,7 +18,15 @@
         } else if(status.state == 403) {
           $scope.incorrectCredentials = true;
         }
-       });
+      });
+    };
+
+    $scope.hideShowPassword = () => {
+      if ($scope.inputType === 'password') {
+        $scope.inputType = 'text';
+      } else {
+        $scope.inputType = 'password';
+      }
     };
 
     $scope.signup = function() {
diff --git a/ui/src/app/views/login.html b/ui/src/app/views/login.html
index 75cfc8a4..909cd82f 100755
--- a/ui/src/app/views/login.html
+++ b/ui/src/app/views/login.html
@@ -2,12 +2,17 @@
     <img class="logo" ng-src="assets/images/logo.png">
     <div layout="column" class="login-content">
         <md-input-container class="input-container">
-            <label>User name</label>
+            <label>Username</label>
             <input type="text" ng-model="user.user_name" />
         </md-input-container>
         <md-input-container class="input-container">
             <label>Password</label>
-            <input type="password" ng-model="user.password" ng-enter="login()" />
+            <input type="{{inputType}}" ng-model="user.password" ng-enter="login()" />
+        </md-input-container>
+        <label><input type="checkbox" id="checkbox" ng-model="passwordCheckbox" ng-click="hideShowPassword()"/>
+            <span ng-if="passwordCheckbox">Hide password</span>
+            <span ng-if="!passwordCheckbox">Show password</span>
+        </label><br/>
         </md-input-container>
         <md-button class="md-raised md-primary login-button" ng-click="login()">Login</md-button>
         <div layout="row">