diff --git a/src/lib/Hydra/Controller/Admin.pm b/src/lib/Hydra/Controller/Admin.pm
index d0fba860..6940f5bc 100644
--- a/src/lib/Hydra/Controller/Admin.pm
+++ b/src/lib/Hydra/Controller/Admin.pm
@@ -83,7 +83,7 @@ sub updateUser {
             $user->userroles->create({ role => $s}) ;
         }       
     } else {
-        $user->userroles->create({ role => $roles}) ;
+        $user->userroles->create({ role => $roles}) if defined $roles ;
     }   
 }
 
@@ -158,7 +158,7 @@ sub reset_password : Chained('user') PathPart('reset-password') Args(0) {
         "New password for Hydra",
         "Hi,\n\n".
         "Your password has been reset. Your new password is '$password'.\n".
-        "You can change your password at http://".hostname_long." .\n".
+        "You can change your password at http://".hostname_long."/change-password .\n".
         "With regards, Hydra\n"
     );