diff --git a/public/app/core/controllers/signup_ctrl.ts b/public/app/core/controllers/signup_ctrl.ts
index dbaca216e30..1e5599be48c 100644
--- a/public/app/core/controllers/signup_ctrl.ts
+++ b/public/app/core/controllers/signup_ctrl.ts
@@ -21,8 +21,9 @@ export class SignUpCtrl {
     $scope.navModel = {
       main: {
         icon: 'gicon gicon-branding',
+        text: 'Sign Up',
         subTitle: 'Register your Grafana account',
-        breadcrumbs: [{ title: 'Login', url: 'login' }, { title: 'Sign Up' }],
+        breadcrumbs: [{ title: 'Login', url: 'login' }],
       },
     };
 
diff --git a/public/app/partials/reset_password.html b/public/app/partials/reset_password.html
index 340d8f8f329..92ed91d5f4d 100644
--- a/public/app/partials/reset_password.html
+++ b/public/app/partials/reset_password.html
@@ -18,7 +18,7 @@
 
 			</div>
 		</form>
-		<div ng-if="mode === 'email-sent'">
+		<div ng-show="mode === 'email-sent'">
 			An email with a reset link as been sent to the email address. <br>
 			You should receive it shortly.
 			<div class="p-t-1">
@@ -27,5 +27,23 @@
 				</a>
 			</div>
 		</div>
+		<form name="resetForm" class="login-form gf-form-group" ng-show="mode === 'reset'">
+			<div class="gf-form">
+				<span class="gf-form-label width-9">New Password</span>
+				<input type="password" name="NewPassword" class="gf-form-input max-width-14" required ng-minlength="4" ng-model='formModel.newPassword' placeholder="password" watch-change="formModel.newPassword = inputValue;">
+			</div>
+			<div class="gf-form">
+				<span class="gf-form-label width-9">Confirm Password</span>
+				<input type="password" name="ConfirmPassword" class="gf-form-input max-width-14" required ng-minlength="4" ng-model='formModel.confirmPassword' placeholder="confirm password">
+			</div>
+			<div class="signup__password-strength">
+				<password-strength password="formModel.newPassword"></password-strength>
+			</div>
+			<div class="gf-form-button-row">
+				<button type="submit" class="btn btn-success" ng-click="submitReset();" ng-disabled="!resetForm.$valid">
+					Reset Password
+				</button>
+			</div>
+		</form>
 	</div>
 </div>