diff --git a/packages/rocketchat-ui-login/client/login/form.html b/packages/rocketchat-ui-login/client/login/form.html
index 26573b5b653b..885e0826b6a4 100644
--- a/packages/rocketchat-ui-login/client/login/form.html
+++ b/packages/rocketchat-ui-login/client/login/form.html
@@ -8,8 +8,13 @@
 			{{#if state 'wait-activation'}}
 				<header>
 					<h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
-					<p>{{{_ "Wait_activation_warning"}}}</p>
-					<p>{{{_ "Please_wait_activation"}}}</p>
+					<p>{{_ "Wait_activation_warning"}}</p>
+					<p>{{_ "Please_wait_activation"}}</p>
+				</header>
+			{{else if state 'wait-email-activation'}}
+				<header>
+					<h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
+					<p>{{_ "We_have_sent_registration_email"}}</p>
 				</header>
 			{{else}}
 				{{> loginServices }}
diff --git a/packages/rocketchat-ui-login/client/login/form.js b/packages/rocketchat-ui-login/client/login/form.js
index a0a63bf421ea..e242757776ae 100644
--- a/packages/rocketchat-ui-login/client/login/form.js
+++ b/packages/rocketchat-ui-login/client/login/form.js
@@ -121,8 +121,7 @@ Template.loginForm.events({
 					RocketChat.callbacks.run('userRegistered');
 					return Meteor.loginWithPassword(s.trim(formData.email), formData.pass, function(error) {
 						if (error && error.error === 'error-invalid-email') {
-							toastr.success(t('We_have_sent_registration_email'));
-							return instance.state.set('login');
+							return instance.state.set('wait-email-activation');
 						} else if (error && error.error === 'error-user-is-not-activated') {
 							return instance.state.set('wait-activation');
 						} else {
diff --git a/packages/rocketchat_theme/client/imports/general/base_old.css b/packages/rocketchat_theme/client/imports/general/base_old.css
index 2cefd31d2ece..fe61d13a9f15 100644
--- a/packages/rocketchat_theme/client/imports/general/base_old.css
+++ b/packages/rocketchat_theme/client/imports/general/base_old.css
@@ -4666,6 +4666,11 @@ body:not(.is-cordova) {
 	& .logo {
 		display: block;
 
+		width: 100%;
+		max-width: 520px;
+		margin: 0 auto;
+		padding: 0 20px;
+
 		& > img {
 			position: relative;
 			z-index: 20;