diff --git a/src/js/login.js b/src/js/login.js
index 315514867..bb7ea9ef4 100644
--- a/src/js/login.js
+++ b/src/js/login.js
@@ -10,11 +10,13 @@ app.controller('LoginController', ['$scope', '$http', function ($scope, $http) {
     var search = decodeURIComponent(window.location.search).slice(1).split('&').map(function (item) { return item.indexOf('=') === -1 ? [item, true] : [item.slice(0, item.indexOf('=')), item.slice(item.indexOf('=')+1)]; }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {});
 
     $scope.initialized = false;
+    $scope.passwordReset = !!search.passwordReset;
     $scope.busy = false;
     $scope.error = null;
     $scope.username = '';
     $scope.password = '';
     $scope.totpToken = '';
+    $scope.passwordResetIdentifier = '';
 
     $scope.onLogin = function () {
         $scope.busy = true;
@@ -43,4 +45,18 @@ app.controller('LoginController', ['$scope', '$http', function ($scope, $http) {
             window.location.href = search.returnTo || '/';
         }).error(error);
     };
+
+    $scope.onPasswordReset = function () {
+
+    };
+
+    $scope.showPasswordReset = function () {
+        $scope.passwordReset = true;
+        setTimeout(function () { $('#inputPasswordResetIdentifier').focus(); }, 200);
+    };
+
+    $scope.showLogin = function () {
+        $scope.passwordReset = false;
+        setTimeout(function () { $('#inputUsername').focus(); }, 200);
+    };
 }]);
diff --git a/src/login.html b/src/login.html
index 37aeb69e4..c94ac5570 100644
--- a/src/login.html
+++ b/src/login.html
@@ -42,13 +42,14 @@
 
 <div class="layout-root">
 
-  <div class="layout-content">
+  <div class="layout-content" ng-hide="passwordReset">
     <div class="card" style="padding: 20px; margin-top: 100px; max-width: 620px;">
       <div class="row">
         <div class="col-md-12" style="text-align: center;">
           <img width="128" height="128" style="margin-top: -84px" src="<%= apiOrigin %>/api/v1/cloudron/avatar"/>
           <br/>
           <h2>Cloudron Login</h2>
+          <h2 ng-show="passwordReset">Password Reset</h2>
         </div>
       </div>
       <br/>
@@ -74,7 +75,37 @@
             </div>
             <input class="btn btn-primary btn-outline pull-right" type="submit" value="Sign in" ng-disabled="loginForm.$invalid"/>
           </form>
-          <a href="/api/v1/session/password/resetRequest.html">Reset password</a>
+          <a ng-href="" class="hand" ng-click="showPasswordReset()">Reset password</a>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="layout-content" ng-show="passwordReset">
+    <div class="card" style="padding: 20px; margin-top: 100px; max-width: 620px;">
+      <div class="row">
+        <div class="col-md-12" style="text-align: center;">
+          <img width="128" height="128" style="margin-top: -84px" src="<%= apiOrigin %>/api/v1/cloudron/avatar"/>
+          <br/>
+          <h2>Password Reset</h2>
+        </div>
+      </div>
+      <br/>
+      <div class="row">
+        <div class="col-md-12">
+          <h4 class="has-error" ng-show="error">Invalid Credentials</h4>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-12">
+          <form name="passwordResetForm" ng-submit="onPasswordReset()">
+            <div class="form-group">
+              <label class="control-label" for="inputPasswordResetIdentifier">Username or Email</label>
+              <input type="text" class="form-control" id="inputPasswordResetIdentifier" name="passwordResetIdentifier" ng-model="passwordResetIdentifier" autofocus required>
+            </div>
+            <input class="btn btn-primary btn-outline pull-right" type="submit" value="Reset" ng-disabled="passwordResetForm.$invalid"/>
+          </form>
+          <a ng-href="" class="hand" ng-click="showLogin()">Back to login</a>
         </div>
       </div>
     </div>