diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/UserService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/UserService.java
index 2b8d3c9..c9ff4c8 100644
--- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/UserService.java
+++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/UserService.java
@@ -132,7 +132,7 @@ public class UserService {
         try {
             this.getTenantUsersResource().get(userId).executeActionsEmail(Collections.singletonList("UPDATE_PASSWORD"), 86400);
         } catch (Exception e) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Failed to send email", e);
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Failed to send email.", e);
         }
     }
 
@@ -445,12 +445,12 @@ public class UserService {
 
         try {
             CredentialRepresentation request = new CredentialRepresentation();
-            request.setType("password");
+            request.setType(CredentialRepresentation.PASSWORD);
             request.setTemporary(resetPasswordRequest.isTemporary());
             request.setValue(resetPasswordRequest.getPassword());
             realmService.realm(TenantContext.getTenantId()).users().get(userId).resetPassword(request);
         } catch (Exception e) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Failed to send email", e);
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Could not reset password. Please check your input.", e);
         }
     }