1 files changed, 14 insertions, 30 deletions
diff --git a/client/config/accounts.js b/client/config/accounts.js
index 9e0d17d3..5e6edd39 100644
--- a/client/config/accounts.js
+++ b/client/config/accounts.js
@@ -1,35 +1,19 @@
+var passwordField = AccountsTemplates.removeField('password');
+var emailField = AccountsTemplates.removeField('email');
+AccountsTemplates.addFields([{
+  _id: 'username',
+  type: 'text',
+  displayName: 'username',
+  required: true,
+  minLength: 5
+}, emailField, passwordField]);
+
 AccountsTemplates.configure({
   confirmPassword: false,
   enablePasswordChange: true,
   sendVerificationEmail: true,
-  showForgotPasswordLink: true
-});
-
-AccountsTemplates.removeField('password');
-AccountsTemplates.removeField('email');
-AccountsTemplates.addFields([
-  {
-    _id: 'username',
-    type: 'text',
-    displayName: 'username',
-    required: true,
-    minLength: 5
-  },
-  {
-    _id: 'email',
-    type: 'email',
-    required: true,
-    displayName: 'email',
-    re: /.+@(.+){2,}\.(.+){2,}/,
-    errStr: 'Invalid email'
-  },
-  {
-    _id: 'password',
-    type: 'password',
-    placeholder: {
-      signUp: 'At least six characters'
-    },
-    required: true,
-    minLength: 6
+  showForgotPasswordLink: true,
+  onLogoutHook: function() {
+    Router.go('Home');
   }
-]);
+});