1 files changed, 15 insertions, 5 deletions
diff --git a/config/accounts.js b/config/accounts.js
index 9ab26b33..279325fb 100644
--- a/config/accounts.js
+++ b/config/accounts.js
@@ -1,19 +1,32 @@
 const passwordField = AccountsTemplates.removeField('password');
 const emailField = AccountsTemplates.removeField('email');
+
 AccountsTemplates.addFields([{
   _id: 'username',
   type: 'text',
   displayName: 'username',
   required: true,
   minLength: 2,
-}, emailField, passwordField]);
+}, emailField, passwordField, {
+  _id: 'invitationcode',
+  type: 'text',
+  displayName: 'Invitation Code',
+  required: false,
+  minLength: 6,
+  template: 'invitationCode',
+}]);
+
+let sendVerificationEmail = false;
+if (process.env.MAIL_URL) {
+  sendVerificationEmail = true;
+}
 
 AccountsTemplates.configure({
   defaultLayout: 'userFormsLayout',
   defaultContentRegion: 'content',
   confirmPassword: false,
   enablePasswordChange: true,
-  sendVerificationEmail: true,
+  sendVerificationEmail,
   showForgotPasswordLink: true,
   onLogoutHook() {
     const homePage = 'home';
@@ -48,9 +61,6 @@ AccountsTemplates.configureRoute('changePwd', {
 });
 
 if (Meteor.isServer) {
-  if (process.env.MAIL_FROM) {
-    Accounts.emailTemplates.from = process.env.MAIL_FROM;
-  }
 
   ['resetPassword-subject', 'resetPassword-text', 'verifyEmail-subject', 'verifyEmail-text', 'enrollAccount-subject', 'enrollAccount-text'].forEach((str) => {
     const [templateName, field] = str.split('-');