diff --git a/dashboard/src/js/passwordreset.js b/dashboard/src/js/passwordreset.js
index 586f7233f..67ebcd6fa 100644
--- a/dashboard/src/js/passwordreset.js
+++ b/dashboard/src/js/passwordreset.js
@@ -81,7 +81,8 @@ app.controller('PasswordResetController', ['$scope', '$translate', '$http', func
             identifier: $scope.passwordResetIdentifier
         };
 
-        function done() {
+        function done(error) {
+            if (error) $scope.error = error.message;
             $scope.busy = false;
             $scope.mode = 'passwordResetDone';
         }
diff --git a/dashboard/src/passwordreset.html b/dashboard/src/passwordreset.html
index fe268778e..e5a49b796 100644
--- a/dashboard/src/passwordreset.html
+++ b/dashboard/src/passwordreset.html
@@ -89,7 +89,8 @@
         <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>{{ 'passwordReset.emailSent.title' | tr }}</h2>
+          <h2 ng-hide="error">{{ 'passwordReset.emailSent.title' | tr }}</h2>
+          <h4 ng-show="error" class="has-error">{{ error }}</h4>
           <br/>
           <a href="/" class="btn btn-primary">{{ 'passwordReset.backToLoginAction' | tr }}</a>
         </div>