diff --git a/client/views/login/form.coffee b/client/views/login/form.coffee
index 0a2972fd5da..eafffecefc3 100644
--- a/client/views/login/form.coffee
+++ b/client/views/login/form.coffee
@@ -24,7 +24,7 @@ Template.loginForm.helpers
 		return 'hidden' unless Template.instance().state.get() is 'login'
 
 	showBackToLoginLink: ->
-		return 'hidden' unless Template.instance().state.get() in ['register', 'forgot-password', 'email-verification']
+		return 'hidden' unless Template.instance().state.get() in ['register', 'forgot-password', 'email-verification', 'wait-activation']
 
 	btnLoginSave: ->
 		switch Template.instance().state.get()
@@ -37,6 +37,9 @@ Template.loginForm.helpers
 			when 'forgot-password'
 				return t('Reset_password')
 
+	waitActivation: ->
+		return Template.instance().state.get() is 'wait-activation'
+		
 Template.loginForm.events
 	'submit #login-card': (event, instance) ->
 		event.preventDefault()
@@ -75,6 +78,8 @@ Template.loginForm.events
 						if error?.error is 'no-valid-email'
 							toastr.success t('We_have_sent_registration_email')
 							instance.state.set 'login'
+						else if error?.error is 'inactive-user'
+							instance.state.set 'wait-activation'
 						# else
 							# FlowRouter.go 'index'
 			else
diff --git a/client/views/login/form.html b/client/views/login/form.html
index 8f5eeb6bec7..aa836ccdba3 100644
--- a/client/views/login/form.html
+++ b/client/views/login/form.html
@@ -1,37 +1,45 @@
 <template name="loginForm">
 	<form id="login-card" method='/'>
-		{{ > loginServices }}
-		{{#if needsValidateEmail}}
-			<div class="alert alert-danger">
-				{{_ "You_neeed_confirm_email"}}
+		{{#if waitActivation}}
+			<header>
+				<h2>{{{_ "Registration_Succeeded"}}}</h2>
+				<p>{{{_ "Wait_activation_warning"}}}</p>
+				<p>{{{_ "Please_wait_activation"}}}</p>
+			</header>
+		{{else}}
+			{{ > loginServices }}
+			{{#if needsValidateEmail}}
+				<div class="alert alert-danger">
+					{{_ "You_need_confirm_email"}}
+				</div>
+			{{/if}}
+			<div class="fields">
+				<div class='input-text active {{showName}}'>
+					<input type="text" name='name' placeholder='{{_ "Name"}}' dir="auto" />
+				</div>
+				<div class='input-text active {{showEmailOrUsername}}'>
+					<input type="text" name='emailOrUsername' placeholder='{{_ "Email_or_username"}}' autocapitalize="off" autocorrect="off" />
+				</div>
+				<div class='input-text active {{showEmail}}'>
+					<input type="email" name='email' placeholder='{{_ "Email"}}' />
+				</div>
+				<div class='input-text active {{showPassword}}'>
+					<input type="password" name='pass' placeholder='{{_ "Password"}}' />
+				</div>
+				<div class='input-text active {{showConfirmPassword}}'>
+					<input type="password" name='confirm-pass' placeholder='{{_ "Confirm_password"}}' />
+				</div>
 			</div>
-		{{/if}}
-		<div class="fields">
-			<div class='input-text active {{showName}}'>
-				<input type="text" name='name' placeholder='{{_ "Name"}}' dir="auto" />
-			</div>
-			<div class='input-text active {{showEmailOrUsername}}'>
-				<input type="text" name='emailOrUsername' placeholder='{{_ "Email_or_username"}}' autocapitalize="off" autocorrect="off" />
+			<div class="submit">
+				<button data-loading-text="{{_ "Please_wait"}}..." class='button primary login'><span>{{btnLoginSave}}</span></button>
 			</div>
-			<div class='input-text active {{showEmail}}'>
-				<input type="email" name='email' placeholder='{{_ "Email"}}' />
+			<div class="register {{showRegisterLink}}">
+				<a href="">{{_ 'Register'}}</a>
 			</div>
-			<div class='input-text active {{showPassword}}'>
-				<input type="password" name='pass' placeholder='{{_ "Password"}}' />
+			<div class="forgot-password {{showForgotPasswordLink}}">
+				<a href="">{{_ 'Forgot_password'}}</a>
 			</div>
-			<div class='input-text active {{showConfirmPassword}}'>
-				<input type="password" name='confirm-pass' placeholder='{{_ "Confirm_password"}}' />
-			</div>
-		</div>
-		<div class="submit">
-			<button data-loading-text="{{_ "Please_wait"}}..." class='button primary login'><span>{{btnLoginSave}}</span></button>
-		</div>
-		<div class="register {{showRegisterLink}}">
-			<a href="">{{_ 'Register'}}</a>
-		</div>
-		<div class="forgot-password {{showForgotPasswordLink}}">
-			<a href="">{{_ 'Forgot_password'}}</a>
-		</div>
+		{{/if}}
 		<div class="back-to-login {{showBackToLoginLink}}">
 			<a href="">{{_ 'Back_to_login'}}</a>
 		</div>
diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json
index e54feaf0357..4425223ece1 100644
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@@ -213,7 +213,7 @@
   "Welcome_to_the" : "Willkommen bei",
   "With_whom" : "Mit wem?",
   "you_are_in_preview_mode_of" : "Sie sind m Vorschau-Modus des Kanals #<strong>__room_name__</strong>",
-  "You_neeed_confirm_email" : "Sie müssen Ihre Email bestätigen!",
+  "You_need_confirm_email" : "Sie müssen Ihre Email bestätigen!",
   "Your_Open_Source_solution" : "Deine eigene Open Source Chat Lösung",
   "You_will_not_be_able_to_recover" : "Sie können es nicht wieder rückgängig machen!",
   "Yes_delete_it" : "Ja, lösche es!",
diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json
index abff0d75391..c3927da5e39 100644
--- a/i18n/el.i18n.json
+++ b/i18n/el.i18n.json
@@ -214,7 +214,7 @@
   "Welcome_to_the" : "Καλως ήλθατε στο",
   "With_whom" : "Με ποιον",
   "you_are_in_preview_mode_of" : "Είστε σε κατάσταση προεπισκόπησης του καναλιού #<strong>__room_name__</strong>",
-  "You_neeed_confirm_email" : "Πρεπει να επιβεβαίώσετε το email σας για να συνδεθείτε!",
+  "You_need_confirm_email" : "Πρεπει να επιβεβαίώσετε το email σας για να συνδεθείτε!",
   "Your_Open_Source_solution" : "Η δικιά σου λύση ανοιχτού κώδικα",
   "You_will_not_be_able_to_recover" : "Δεν θα μπορείτε να το επαναφέρετε!",
   "Yes_delete_it" : "Ναι, διέγραψέ το!",
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 183f8f26219..b50399f5474 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -1,6 +1,7 @@
 {
   "Access_online_demo" : "Access the online demo",
   "Access_Online_Demo" : "Access the Online Demo",
+  "Accounts_ManuallyApproveNewUsers" : "Manually aprove new users",
   "Accounts_denyUnverifiedEmail" : "Deny unverified e-mail",
   "Accounts_EmailVerification" : "E-mail Verification",
   "Accounts_RegistrationRequired" : "Registration Required",
@@ -158,6 +159,7 @@
   "Password" : "Password",
   "Password_changed_successfully" : "Password changed successfully",
   "Please_wait" : "Please wait",
+  "Please_wait_activation" : "Please wait, this can take some time.",
   "Powered_by" : "Powered by",
   "Privacy" : "Privacy",
   "Private_Groups" : "Private Groups",
@@ -177,6 +179,7 @@
   "quote" : "quote",
   "Recents" : "Recents",
   "Register" : "Register a new account",
+  "Registration_Succeeded" : "Registration Succeeded",
   "Remember_me" : "Remember me",
   "Remove" : "Remove",
   "Remove_Admin" : "Remove Admin",
@@ -225,6 +228,7 @@
   "User_has_been_deactivated" : "User has been deactivated",
   "User_has_been_deleted" : "User has been deleted",
   "User_is_no_longer_an_admin" : "User is no longer an admin",
+  "User_is_not_activated" : "User is not activated",
   "User_is_now_an_admin" : "User is now an admin",
   "User_joined_channel" : "Has joined the channel.",
   "User_joined_channel_female" : "Has joined the channel.",
@@ -243,6 +247,7 @@
   "Username_title" : "Register username",
   "Username_unavaliable" : "<strong>%s</strong> is already in use :(",
   "View_All" : "View All",
+  "Wait_activation_warning" : "Before you can login, your account must be manually activated by an administrator.",
   "We_have_sent_password_email" : "We have sent you an e-mail with password reset instructions. If you do not receive an e-mail shortly, please come back and try again.",
   "We_have_sent_registration_email" : "We have sent you an e-mail to confirm your registration. If you do not receive an e-mail shortly, please come back and try again.",
   "Welcome" : "Welcome <em>%s</em>.",
@@ -250,7 +255,7 @@
   "With_whom" : "With whom",
   "Yes_delete_it" : "Yes, delete it!",
   "you_are_in_preview_mode_of" : "You are in preview mode of channel #<strong>__room_name__</strong>",
-  "You_neeed_confirm_email" : "You need to confirm your email to login!",
+  "You_need_confirm_email" : "You need to confirm your email to login!",
   "You_will_not_be_able_to_recover" : "You will not be able to recover!",
   "Your_entry_has_been_deleted" : "Your entry has been deleted.",
   "Your_Open_Source_solution" : "Your own Open Source chat solution"
diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json
index 49ce1c738fe..fe16f2cf9dc 100644
--- a/i18n/es.i18n.json
+++ b/i18n/es.i18n.json
@@ -135,6 +135,6 @@
   "Welcome" : "Bienvenido <em>%s</em>.",
   "Welcome_to_the" : "Bienvenido a la",
   "With_whom" : "Con quien",
-  "You_neeed_confirm_email" : "¡Es necesario confirmar tu correo electrónico para poder identificarte!",
+  "You_need_confirm_email" : "¡Es necesario confirmar tu correo electrónico para poder identificarte!",
   "Your_Open_Source_solution" : "Tu propia solución de chat de código abierto"
 }
\ No newline at end of file
diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json
index 946f978c81b..09201b9a155 100644
--- a/i18n/fi.i18n.json
+++ b/i18n/fi.i18n.json
@@ -207,7 +207,7 @@
   "Welcome_to_the" : "Tervetuloa",
   "With_whom" : "kanssa",
   "you_are_in_preview_mode_of" : "Tämä on kanavan #<strong>__room_name__</strong> esikatselutila",
-  "You_neeed_confirm_email" : "Sinun tulee vahvistaa sähköpostiosoitteesi!",
+  "You_need_confirm_email" : "Sinun tulee vahvistaa sähköpostiosoitteesi!",
   "Your_Open_Source_solution" : "Your own Open Source chat solution",
   "You_will_not_be_able_to_recover" : "Palauttaminen ei ole mahdollista!",
   "Yes_delete_it" : "Kyllä, poista!",
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index 293f915fb23..3585d3e85e3 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -168,7 +168,7 @@
   "Welcome_to_the" : "Bienvenue sur",
   "With_whom" : "Avec qui",
   "you_are_in_preview_mode_of" : "Aperçu du salon #<strong>__room_name__</strong> ",
-  "You_neeed_confirm_email" : "Vous devez confirmer votre adresse email pour vous connecter !",
+  "You_need_confirm_email" : "Vous devez confirmer votre adresse email pour vous connecter !",
   "Your_Open_Source_solution" : "Votre propre solution de chat Open Source",
   "You_will_not_be_able_to_recover" : "Cette action n'est pas réversible !",
   "Yes_delete_it" : "Oui, je confirme la suppression !",
diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json
index 1c8db528aab..17238177544 100644
--- a/i18n/he.i18n.json
+++ b/i18n/he.i18n.json
@@ -145,6 +145,6 @@
   "Welcome" : "ברוך הבא <em>%s</em>.",
   "Welcome_to_the" : "ברוך הבא ל-",
   "you_are_in_preview_mode_of" : "הנך בתצוגה מוקדמת של ערוץ #<strong>__rom_name__</strong>",
-  "You_neeed_confirm_email" : "הינך צריך לאמת את כתובת האימייל על מנת להתחבר!",
+  "You_need_confirm_email" : "הינך צריך לאמת את כתובת האימייל על מנת להתחבר!",
   "Your_Open_Source_solution" : "פתרון הקוד הפתוח שלך לצ'אט"
 }
\ No newline at end of file
diff --git a/i18n/hr.i18n.json b/i18n/hr.i18n.json
index 5e80d84c535..a6b503e8749 100644
--- a/i18n/hr.i18n.json
+++ b/i18n/hr.i18n.json
@@ -199,7 +199,7 @@
   "Welcome_to_the" : "Dobro došli »",
   "With_whom" : "Sa kim",
   "you_are_in_preview_mode_of" : "Ti si u preglednom načinu kanala # <strong>__room_name__</strong>",
-  "You_neeed_confirm_email" : "Trebaš potvrditi svoj email kako bi se prijavio!",
+  "You_need_confirm_email" : "Trebaš potvrditi svoj email kako bi se prijavio!",
   "Your_Open_Source_solution" : "Vaše vlastito Open Source chat rješenje",
   "You_will_not_be_able_to_recover" : "Ovo nećeš moći promijeniti!",
   "Yes_delete_it" : "Da, obriši!",
diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json
index 1a9f1f4a1df..eb1febf22ce 100644
--- a/i18n/hu.i18n.json
+++ b/i18n/hu.i18n.json
@@ -124,6 +124,6 @@
   "We_have_sent_registration_email" : "Küldtünk egy email-t hogy megerősíthessük a regisztrációt. Ha nem kapnál hamarosan levelet akkor gyere vissza később és próbáld újra.",
   "Welcome" : "Üdvözöllek <em>%s</em>",
   "Welcome_to_the" : "Üdvözöllek a",
-  "You_neeed_confirm_email" : "Kérlek hitelesítsd az email címed a bejelntkezéshez",
+  "You_need_confirm_email" : "Kérlek hitelesítsd az email címed a bejelntkezéshez",
   "Your_Open_Source_solution" : "A saját Nyílt Forrású chat-ed"
 }
\ No newline at end of file
diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json
index e8f8805f203..13a19ec071b 100644
--- a/i18n/it.i18n.json
+++ b/i18n/it.i18n.json
@@ -124,6 +124,6 @@
   "We_have_sent_registration_email" : "Abbiamo inviato una email per confermare la registrazione. Se non ricevi una email a breve tempo, torna e prova di nuovo.",
   "Welcome" : "Benvenuto <em>%s</em>.",
   "Welcome_to_the" : "Benvenuto a",
-  "You_neeed_confirm_email" : "Hai bisogno di confermare il tuo email per accedere!",
+  "You_need_confirm_email" : "Hai bisogno di confermare il tuo email per accedere!",
   "Your_Open_Source_solution" : "La tua soluzione per chat Open Source"
 }
\ No newline at end of file
diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json
index cdf0e0febd6..7a1c2d3a817 100644
--- a/i18n/ja.i18n.json
+++ b/i18n/ja.i18n.json
@@ -131,6 +131,6 @@
   "We_have_sent_registration_email" : "登録を確認するメールを送信しました。すぐにメールが届かない場合は、再度お試しください。",
   "Welcome" : "ようこそ <em>%s</em>.",
   "Welcome_to_the" : "Welcome to the",
-  "You_neeed_confirm_email" : "ログインするためにはメールを確認する必要があります！",
+  "You_need_confirm_email" : "ログインするためにはメールを確認する必要があります！",
   "Your_Open_Source_solution" : "独自のオープンソースチャットソリューション"
 }
\ No newline at end of file
diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json
index a0eabb2e0bb..ef21958dbe0 100644
--- a/i18n/km.i18n.json
+++ b/i18n/km.i18n.json
@@ -170,7 +170,7 @@
   "Welcome_to_the" : "ស្វាគមន៍​មក​កាន់",
   "With_whom" : "ជា​មួយ​នរណា",
   "you_are_in_preview_mode_of" : "អ្នក​ស្ថិត​ក្នុង​ទម្រង់​មើល​ជា​មុន​នៃ​ប៉ុស្តិ៍ #<strong>__room_name__</strong>",
-  "You_neeed_confirm_email" : "អ្នក​ត្រូវ​បញ្ជាក់អ៊ីមែល​ដើម្បី​ឡុកចូល!",
+  "You_need_confirm_email" : "អ្នក​ត្រូវ​បញ្ជាក់អ៊ីមែល​ដើម្បី​ឡុកចូល!",
   "Your_Open_Source_solution" : "ដំណោះ​ស្រាយ​ពិភាក្សាកូដ​ចំហរ​របស់​អ្នក",
   "You_will_not_be_able_to_recover" : "អ្នក​នឹង​មិនអាច​ទាញ​មក​វិញ!",
   "Yes_delete_it" : "បាទ លប់​វា!",
diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json
index 7ac58828b47..e6b24d3fb91 100644
--- a/i18n/ko.i18n.json
+++ b/i18n/ko.i18n.json
@@ -165,7 +165,7 @@
   "Welcome_to_the" : "오신것을 환영합니다",
   "With_whom" : "누구랑?",
   "you_are_in_preview_mode_of" : "#<strong>__room_name__</strong> 채널 미리보기 모드",
-  "You_neeed_confirm_email" : "로그인하려면 이메일 확인이 필요합니다!",
+  "You_need_confirm_email" : "로그인하려면 이메일 확인이 필요합니다!",
   "Your_Open_Source_solution" : "자신만의 오픈소스 채팅 솔루션",
   "You_will_not_be_able_to_recover" : "복구 안됩니다!",
   "Yes_delete_it" : "넵, 삭제!",
diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json
index 9249cb65234..1ce4e7ecec2 100644
--- a/i18n/pl.i18n.json
+++ b/i18n/pl.i18n.json
@@ -190,7 +190,7 @@
   "Welcome_to_the" : "Witaj w",
   "With_whom" : "Z kim",
   "you_are_in_preview_mode_of" : "Jesteś w trybie podglądu kanału # <strong>__room_name__</strong>",
-  "You_neeed_confirm_email" : "Musisz potwierdzić swój adres e-mail, aby zalogować się!",
+  "You_need_confirm_email" : "Musisz potwierdzić swój adres e-mail, aby zalogować się!",
   "Your_Open_Source_solution" : "Twój własny czat Open Source",
   "You_will_not_be_able_to_recover" : "Nie będziesz w stanie odzyskać!",
   "Yes_delete_it" : "Tak, usuń to!",
diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json
index 67901ca35ab..b3ea4672f28 100644
--- a/i18n/pt.i18n.json
+++ b/i18n/pt.i18n.json
@@ -175,7 +175,7 @@
   "Welcome_to_the" : "Bem-vindo ao",
   "With_whom" : "Com quem",
   "you_are_in_preview_mode_of" : "Esta é uma prévia do canal #<strong>__room_name__</strong>",
-  "You_neeed_confirm_email" : "Você precisa confirmar seu email para logar!",
+  "You_need_confirm_email" : "Você precisa confirmar seu email para logar!",
   "Your_Open_Source_solution" : "Sua própria solução Open Source",
   "You_will_not_be_able_to_recover" : "Você não será capaz de desfazer!",
   "Yes_delete_it" : "Sim, exclua!",
diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json
index 7c3b70a0370..66f6b215e7d 100644
--- a/i18n/ru.i18n.json
+++ b/i18n/ru.i18n.json
@@ -167,7 +167,7 @@
   "Welcome" : "Добро пожаловать, <em>%s</em>.",
   "Welcome_to_the" : "Добро пожаловать в",
   "you_are_in_preview_mode_of" : "Вы находитесь в режиме предварительного просмотра канала # <strong>__room_name__</strong>",
-  "You_neeed_confirm_email" : "Необходимо подтвердить email для входа!",
+  "You_need_confirm_email" : "Необходимо подтвердить email для входа!",
   "Your_Open_Source_solution" : "Ваш собственный чат на базе Open Source-технологий",
   "You_will_not_be_able_to_recover" : "Вы не сможете восстановить!",
   "Yes_delete_it" : "Да, удалить его!"
diff --git a/i18n/ta-IN.i18n.json b/i18n/ta-IN.i18n.json
index 2a03468e954..f63cea319fd 100644
--- a/i18n/ta-IN.i18n.json
+++ b/i18n/ta-IN.i18n.json
@@ -99,7 +99,7 @@
   "View_All" : "அனைத்தையும் பார்க்க",
   "Welcome" : "<em>% s</em> உங்களை வரவேற்கிறோம்.",
   "With_whom" : "யாருடன்",
-  "You_neeed_confirm_email" : "நீங்கள் உள்நுழைய உங்கள் மின்னஞ்சல் முகவரியை உறுதிப்படுத்த வேண்டும்!",
+  "You_need_confirm_email" : "நீங்கள் உள்நுழைய உங்கள் மின்னஞ்சல் முகவரியை உறுதிப்படுத்த வேண்டும்!",
   "You_will_not_be_able_to_recover" : "நீங்கள் மீட்க முடியாது!",
   "Yes_delete_it" : "ஆம், நீக்கு!",
   "Your_entry_has_been_deleted" : "உங்கள் உள்ளீடு நீக்கப்பட்டுவிட்டது."
diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json
index bc166b89499..ea55d3949fd 100644
--- a/i18n/tr.i18n.json
+++ b/i18n/tr.i18n.json
@@ -150,7 +150,7 @@
   "Welcome_to_the" : "Hoşgeldiniz",
   "With_whom" : "Kiminle",
   "you_are_in_preview_mode_of" : "Kanal  #<strong>__room_name__</strong>",
-  "You_neeed_confirm_email" : "Giriş yapabilmek için öncelikle e-posta adresinizi onaylamanız gerekmektedir!",
+  "You_need_confirm_email" : "Giriş yapabilmek için öncelikle e-posta adresinizi onaylamanız gerekmektedir!",
   "Your_Open_Source_solution" : "Açık Kaynak Sohbet Uygulaması",
   "You_will_not_be_able_to_recover" : "Sen kurtarmak mümkün olmayacaktır!",
   "Yes_delete_it" : "Evet, bunu silin!",
diff --git a/i18n/ug.i18n.json b/i18n/ug.i18n.json
index a4a7e8896bb..b8ef64cc2af 100644
--- a/i18n/ug.i18n.json
+++ b/i18n/ug.i18n.json
@@ -137,6 +137,6 @@
   "View_All" : "ھەممىنى كۆرۈش",
   "Welcome" : "ئەسسالامۇ-ئەلەيكۇم <em>%s</em>.",
   "Welcome_to_the" : "كەلگىنىزگە مەرھابا",
-  "You_neeed_confirm_email" : "ئىلخەتنى جەزملەشتۈرۈپ بولغاندىن كېيىن كىرەلەيسىز!",
+  "You_need_confirm_email" : "ئىلخەتنى جەزملەشتۈرۈپ بولغاندىن كېيىن كىرەلەيسىز!",
   "Your_Open_Source_solution" : "ئۆزىڭىزنىڭ ئوچۇق كودلۇق پاراڭلىشىش ھەل قىلىش ئۇسۇلى"
 }
\ No newline at end of file
diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json
index 83e7d7e986b..060e3f84c8f 100644
--- a/i18n/uk.i18n.json
+++ b/i18n/uk.i18n.json
@@ -125,6 +125,6 @@
   "We_have_sent_registration_email" : "Ми відправили вам по електронній пошті, щоб підтвердити свою реєстрацію. Якщо ви не отримуєте електронну пошту найближчим часом, будь ласка, повернутися і спробувати знову.",
   "Welcome" : "Вітаємо, <em>%s</em>.",
   "Welcome_to_the" : "Ласкаво просимо в",
-  "You_neeed_confirm_email" : "Для входу необхідно підтвердити e-mail!",
+  "You_need_confirm_email" : "Для входу необхідно підтвердити e-mail!",
   "Your_Open_Source_solution" : "Ваш власний Open Source чат"
 }
\ No newline at end of file
diff --git a/i18n/zh.i18n.json b/i18n/zh.i18n.json
index f0ffe7c0cd2..62bdabd53d0 100644
--- a/i18n/zh.i18n.json
+++ b/i18n/zh.i18n.json
@@ -124,6 +124,6 @@
   "We_have_sent_registration_email" : "我们已经向您发出一封电子邮件，以确认您的注册。如果您没有收到邮件，请重试。",
   "Welcome" : "欢迎 <em>%s</em>",
   "Welcome_to_the" : "欢迎来到",
-  "You_neeed_confirm_email" : "登录前请验证您的电子邮件！",
+  "You_need_confirm_email" : "登录前请验证您的电子邮件！",
   "Your_Open_Source_solution" : "您自己的开源聊天解决方案"
 }
\ No newline at end of file
diff --git a/packages/rocketchat-lib/settings/server/startup.coffee b/packages/rocketchat-lib/settings/server/startup.coffee
index 4a5a1a9cdb1..543193d5042 100644
--- a/packages/rocketchat-lib/settings/server/startup.coffee
+++ b/packages/rocketchat-lib/settings/server/startup.coffee
@@ -21,6 +21,7 @@ Meteor.startup ->
 	RocketChat.settings.add 'Accounts_Twitter', false, { type: 'boolean', group: 'Accounts' }
 	RocketChat.settings.add 'Accounts_Twitter_id', '', { type: 'string', group: 'Accounts' }
 	RocketChat.settings.add 'Accounts_Twitter_secret', '', { type: 'string', group: 'Accounts' }
+	RocketChat.settings.add 'Accounts_ManuallyApproveNewUsers', false, { type: 'boolean', group: 'Accounts' }
 
 	RocketChat.settings.addGroup 'API'
 	RocketChat.settings.add 'API_Analytics', '', { type: 'string', group: 'API', public: true }
diff --git a/server/lib/accounts.coffee b/server/lib/accounts.coffee
index e260e9d602e..6667d7bb13f 100644
--- a/server/lib/accounts.coffee
+++ b/server/lib/accounts.coffee
@@ -20,7 +20,7 @@ Accounts.onCreateUser (options, user) ->
 	# console.log 'user ->',JSON.stringify user, null, '  '
 
 	user.status = 'offline'
-	user.active = true
+	user.active = not RocketChat.settings.get 'Accounts_ManuallyApproveNewUsers'
 
 	serviceName = null
 
@@ -59,7 +59,7 @@ Accounts.validateLoginAttempt (login) ->
 		return login.allowed
 
 	if login.user?.active isnt true
-		throw new Meteor.Error 'inactive-user', 'Your_user_has_been_deactivated'
+		throw new Meteor.Error 'inactive-user', TAPi18next.t 'project:User_is_not_activated'
 		return false
 
 	if login.type is 'password' and RocketChat.settings.get('Accounts_denyUnverifiedEmails') is true