diff --git a/Changes b/Changes
index 5c83cc41..d14be118 100644
--- a/Changes
+++ b/Changes
@@ -1,7 +1,8 @@
+        - Fix recover password (plu)
         - Fix prefs button label
         - Fix: /foo.photo/1 was broken (plu)
         - Add new config option to enforce login: 
-          <permissions>enforce_login 1</permissions>
+          <permissions>enforce_login 1</permissions> (plu)
 
 0.999018 2008-07-16 19:45:00
         - Fix selenium tests
diff --git a/lib/MojoMojo/Controller/User.pm b/lib/MojoMojo/Controller/User.pm
index 1ae6fc47..1300f4da 100644
--- a/lib/MojoMojo/Controller/User.pm
+++ b/lib/MojoMojo/Controller/User.pm
@@ -151,8 +151,9 @@ sub recover_pass : Global {
 	$c->flash->{message}='Could not recover password.';
 	return $c->res->redirect($c->uri_for('login'));
     }
-    my $password:Stashed;
+    my $password : Stashed = '';
     ($password)=Crypt::PassGen::passgen(NLETT=>6,NWORDS=>1);
+    my $message:Stashed='';
     if ($c->email(
         header => [
             From    => $c->config->{system_mail},
@@ -163,9 +164,9 @@ sub recover_pass : Global {
     )){
         $user->pass($password);
         $user->update();
-        my $message:Stashed='Emailed you your new password.';
+        $message = 'Emailed you your new password.';
     } else {
-        my $message:Stashed='Error occurred while emailing you your new password.';
+        $message = 'Error occurred while emailing you your new password.';
     }
     $c->forward('login');
 }