diff --git a/admin/inc/class.admin_passwordreset.inc.php b/admin/inc/class.admin_passwordreset.inc.php
index e0343d1bfb..c25b084fe3 100644
--- a/admin/inc/class.admin_passwordreset.inc.php
+++ b/admin/inc/class.admin_passwordreset.inc.php
@@ -72,6 +72,9 @@ class admin_passwordreset
 		}
 		if (is_array($content))
 		{
+			// Save message for next time
+			Api\Config::save_value('password_reset_message',array('subject' => $content['subject'], 'body' => $content['body']),'admin');
+
 			if ($content['download_csv'] && $content['changed'])
 			{
 				Api\Header\Content::type('changed.csv', 'text/csv');
@@ -258,6 +261,12 @@ class admin_passwordreset
 			passwdhashes($GLOBALS['egw_info']['server'],true);
 		$sel_options['activate'] = array('Deactivate','Activate');
 
+		// Start with same message as last time
+		$config = Api\Config::read('admin');
+		$message = $config['password_reset_message'];
+		$content['subject'] = $message['subject'];
+		$content['body'] = $message['body'];
+
 		$content['replacements'] = array();
 		foreach($this->replacements as $name => $label)
 		{