diff --git a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java
index 525633ad..91e74cf2 100644
--- a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java
+++ b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.java
@@ -74,8 +74,8 @@ public class PasswordRecoveryPage extends BasePage {
 		publicUrl += "/recover2";
 
 		return String
-				.format("You asked for password recovery, <a href='%s'>follow this link</a> to change your password. Ignore this if you didn't request a password recovery.",
-						callbackUrl(user, publicUrl));
+				.format("You asked for password recovery for account '%s', <a href='%s'>follow this link</a> to change your password. Ignore this if you didn't request a password recovery.",
+						user.getName(), callbackUrl(user, publicUrl));
 	}
 
 	private String callbackUrl(User user, String publicUrl) throws Exception {
diff --git a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html
index 8fcee7c5..f15433fd 100644
--- a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html
+++ b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html
@@ -17,7 +17,7 @@
 				</div>
 			</div>
 			<div class="control-group">
-				<label class="control-label">Email address (optional, for password recovery only)</label>
+				<label class="control-label">Email address (used for password recovery only)</label>
 				<div class="controls">
 					<input type="email" wicket:id="email" class="input-block-level"></input>
 				</div>
diff --git a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java
index 180aadad..832d45d1 100644
--- a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java
+++ b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java
@@ -12,7 +12,6 @@ import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.PasswordTextField;
 import org.apache.wicket.markup.html.form.RequiredTextField;
 import org.apache.wicket.markup.html.form.StatelessForm;
-import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -93,7 +92,7 @@ public class RegisterPanel extends Panel {
 						}));
 		form.add(new PasswordTextField("password", MF.m(model, p.getPassword()))
 				.setResetPassword(false).add(StringValidator.minimumLength(6)));
-		form.add(new TextField<String>("email", MF.m(model, p.getEmail())) {
+		form.add(new RequiredTextField<String>("email", MF.m(model, p.getEmail())) {
 			@Override
 			protected String getInputType() {
 				return "email";