diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js
index cd857ef925f6..7a6b9d4a5147 100644
--- a/packages/rocketchat-lib/server/startup/settings.js
+++ b/packages/rocketchat-lib/server/startup/settings.js
@@ -628,9 +628,21 @@ RocketChat.settings.addGroup('OAuth', function() {
 });
 
 RocketChat.settings.addGroup('General', function() {
-	this.add('Show_Setup_Wizard', true, {
-		type: 'boolean',
-		public: true
+	this.add('Show_Setup_Wizard', 'pending', {
+		type: 'select',
+		public: true,
+		values: [
+			{
+				key: 'pending',
+				i18nLabel: 'Pending'
+			}, {
+				key: 'in_progress',
+				i18nLabel: 'In_progress'
+			}, {
+				key: 'completed',
+				i18nLabel: 'Completed'
+			}
+		]
 	});
 	this.add('Site_Url', typeof __meteor_runtime_config__ !== 'undefined' && __meteor_runtime_config__ !== null ? __meteor_runtime_config__.ROOT_URL : null, {
 		type: 'string',
@@ -639,7 +651,6 @@ RocketChat.settings.addGroup('General', function() {
 	});
 	this.add('Site_Name', 'Rocket.Chat', {
 		type: 'string',
-		'public': true,
 		wizard: {
 			step: 3,
 			order: 0
@@ -647,7 +658,6 @@ RocketChat.settings.addGroup('General', function() {
 	});
 	this.add('Language', '', {
 		type: 'language',
-		'public': true,
 		wizard: {
 			step: 3,
 			order: 1
@@ -1659,7 +1669,6 @@ RocketChat.settings.addGroup('Setup_Wizard', function() {
 					i18nLabel: 'Community'
 				}
 			],
-			public: true,
 			wizard: {
 				step: 2,
 				order: 0
@@ -1667,7 +1676,6 @@ RocketChat.settings.addGroup('Setup_Wizard', function() {
 		});
 		this.add('Organization_Name', '', {
 			type: 'string',
-			public: true,
 			wizard: {
 				step: 2,
 				order: 1
@@ -1777,7 +1785,6 @@ RocketChat.settings.addGroup('Setup_Wizard', function() {
 					i18nLabel: 'Other'
 				}
 			],
-			public: true,
 			wizard: {
 				step: 2,
 				order: 2
@@ -1819,7 +1826,6 @@ RocketChat.settings.addGroup('Setup_Wizard', function() {
 					i18nLabel: '4000 or more people'
 				}
 			],
-			public: true,
 			wizard: {
 				step: 2,
 				order: 3
@@ -2789,7 +2795,6 @@ RocketChat.settings.addGroup('Setup_Wizard', function() {
 					i18nLabel: 'Country_Zimbabwe'
 				}
 			],
-			public: true,
 			wizard: {
 				step: 2,
 				order: 4
@@ -2797,7 +2802,6 @@ RocketChat.settings.addGroup('Setup_Wizard', function() {
 		});
 		this.add('Website', '', {
 			type: 'string',
-			public: true,
 			wizard: {
 				step: 2,
 				order: 5
@@ -2815,7 +2819,6 @@ RocketChat.settings.addGroup('Setup_Wizard', function() {
 					i18nLabel: 'Public_Community'
 				}
 			],
-			public: true,
 			wizard: {
 				step: 3,
 				order: 2
diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.html b/packages/rocketchat-setup-wizard/client/setupWizard.html
index 8a7b710054de..6f082939f37c 100644
--- a/packages/rocketchat-setup-wizard/client/setupWizard.html
+++ b/packages/rocketchat-setup-wizard/client/setupWizard.html
@@ -18,6 +18,9 @@ <h1 class="setup-wizard-info__content-title setup-wizard-final__box-title">{{_ "
 </template>
 
 <template name="setupWizard">
+	<div class="rc-old connection-status">
+		{{> status}}
+	</div>
 	<div class="setup-wizard">
 		<section class="setup-wizard-info">
 			<header class="setup-wizard-info__header">
@@ -105,6 +108,7 @@ <h1 class="setup-wizard-forms__header-title">{{headerTitle}}</h1>
 											<div class="rc-input__title">{{_ i18nLabel}}</div>
 											<div class="rc-select">
 												<select class="rc-select__element js-setting-data" name="{{_id}}">
+													<option value="" disabled selected="{{selectedValue _id undefined}}">{{_ "Select_an_option"}}</option>
 													{{#each values}}
 														<option class="rc-select__option" value="{{key}}" selected="{{selectedValue ../_id key}}">{{_ i18nLabel}}</option>
 													{{/each}}
diff --git a/packages/rocketchat-setup-wizard/client/setupWizard.js b/packages/rocketchat-setup-wizard/client/setupWizard.js
index e04a03003f74..9b6d2bba0311 100644
--- a/packages/rocketchat-setup-wizard/client/setupWizard.js
+++ b/packages/rocketchat-setup-wizard/client/setupWizard.js
@@ -21,6 +21,13 @@ const setSettingsAndGo = (settings, registerServer = true) => {
 };
 
 Template.setupWizard.onCreated(function() {
+	const userId = Meteor.userId();
+	const Show_Setup_Wizard = RocketChat.settings.get('Show_Setup_Wizard');
+
+	if (!userId || Show_Setup_Wizard === 'completed' || !RocketChat.authz.hasRole(userId, 'admin')) {
+		FlowRouter.go('home');
+	}
+
 	if (localStorage.getItem('wizardFinal')) {
 		FlowRouter.go('setup-wizard-final');
 	}
@@ -60,7 +67,7 @@ Template.setupWizard.onCreated(function() {
 			this.state.set('currentStep', 1);
 		}
 
-		if (RocketChat.settings.get('Show_Setup_Wizard') === false) {
+		if (RocketChat.settings.get('Show_Setup_Wizard') === 'completed') {
 			FlowRouter.go('home');
 		}
 
@@ -245,7 +252,10 @@ Template.setupWizard.helpers({
 
 Template.setupWizardFinal.onCreated(function() {
 	Tracker.autorun(() => {
-		if (RocketChat.settings.get('Show_Setup_Wizard') === false) {
+		const userId = Meteor.userId();
+		const Show_Setup_Wizard = RocketChat.settings.get('Show_Setup_Wizard');
+
+		if (!userId || Show_Setup_Wizard === 'completed' || !RocketChat.authz.hasRole(userId, 'admin')) {
 			FlowRouter.go('home');
 		}
 	});
@@ -257,7 +267,7 @@ Template.setupWizardFinal.onRendered(function() {
 
 Template.setupWizardFinal.events({
 	'click .js-finish'() {
-		RocketChat.settings.set('Show_Setup_Wizard', false, function() {
+		RocketChat.settings.set('Show_Setup_Wizard', 'completed', function() {
 			localStorage.removeItem('wizard');
 			localStorage.removeItem('wizardFinal');
 			FlowRouter.go('home');
diff --git a/packages/rocketchat-theme/client/imports/components/setup-wizard.css b/packages/rocketchat-theme/client/imports/components/setup-wizard.css
index e8a5fd591ca7..c53a1fb995a3 100644
--- a/packages/rocketchat-theme/client/imports/components/setup-wizard.css
+++ b/packages/rocketchat-theme/client/imports/components/setup-wizard.css
@@ -9,9 +9,9 @@
 	justify-content: center;
 
 	&-info {
-		flex: 0 0 350px;
+		flex: 0 0 auto;
 
-		margin: 55px 65px 0 80px;
+		margin: 55px 65px 30px 80px;
 
 		&__header{
 			display: flex;
@@ -463,3 +463,15 @@
 		}
 	}
 }
+
+@media (width <= 760px) {
+	.setup-wizard {
+		flex-direction: column;
+		justify-content: initial;
+
+		& .setup-wizard-forms__wrapper {
+			margin: 0;
+			width: 100%;
+		}
+	}
+}
diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js
index 46a1b600ba73..4e3a23cc7ad1 100644
--- a/packages/rocketchat-ui-master/client/main.js
+++ b/packages/rocketchat-ui-master/client/main.js
@@ -172,11 +172,10 @@ Template.main.helpers({
 		}
 	},
 	showSetupWizard() {
-		if (RocketChat.settings.get('Show_Setup_Wizard') === false) {
-			return false;
-		}
+		const userId = Meteor.userId();
+		const Show_Setup_Wizard = RocketChat.settings.get('Show_Setup_Wizard');
 
-		return true;
+		return (!userId && Show_Setup_Wizard === 'pending') || (userId && RocketChat.authz.hasRole(userId, 'admin') && Show_Setup_Wizard === 'in_progress');
 	}
 });
 
@@ -197,9 +196,11 @@ Template.main.onRendered(function() {
 		}, 100);
 	});
 	return Tracker.autorun(function() {
+		const userId = Meteor.userId();
 		const user = Meteor.user();
+		const Show_Setup_Wizard = RocketChat.settings.get('Show_Setup_Wizard');
 
-		if (RocketChat.settings.get('Show_Setup_Wizard')) {
+		if ((!userId && Show_Setup_Wizard === 'pending') || (userId && RocketChat.authz.hasRole(userId, 'admin') && Show_Setup_Wizard === 'in_progress')) {
 			FlowRouter.go('setup-wizard');
 		}
 
diff --git a/packages/rocketchat-ui/client/lib/menu.js b/packages/rocketchat-ui/client/lib/menu.js
index b39ea56d2dcf..6dd7a2c10b6c 100644
--- a/packages/rocketchat-ui/client/lib/menu.js
+++ b/packages/rocketchat-ui/client/lib/menu.js
@@ -219,6 +219,10 @@ this.menu.on('clickOut', function() {
 });
 
 this.menu.on('close', function() {
+	if (!this.sidebar) {
+		return;
+	}
+
 	this.sidebar.css('transition', '');
 	this.sidebarWrap.css('transition', '');
 	if (passClosePopover) {
diff --git a/packages/rocketchat-ui/client/lib/tapi18n.js b/packages/rocketchat-ui/client/lib/tapi18n.js
index 65a7357566e6..c1ded6b86050 100644
--- a/packages/rocketchat-ui/client/lib/tapi18n.js
+++ b/packages/rocketchat-ui/client/lib/tapi18n.js
@@ -23,6 +23,6 @@ this.tr = function(key, options, ...replaces) {
 };
 
 this.isRtl = (lang) => {
-	const language = lang ? lang : localStorage.getItem('userLanguage');
+	const language = lang ? lang : localStorage.getItem('userLanguage') ? localStorage.getItem('userLanguage') : 'en-US';
 	return ['ar', 'dv', 'fa', 'he', 'ku', 'ps', 'sd', 'ug', 'ur', 'yi'].includes(language.split('-').shift().toLowerCase());
 };
diff --git a/server/lib/accounts.js b/server/lib/accounts.js
index 946b0b0f67c1..af451d58bcd9 100644
--- a/server/lib/accounts.js
+++ b/server/lib/accounts.js
@@ -220,6 +220,9 @@ Accounts.insertUserDoc = _.wrap(Accounts.insertUserDoc, function(insertUserDoc,
 			roles.push('user');
 		} else {
 			roles.push('admin');
+			if (RocketChat.settings.get('Show_Setup_Wizard') === 'pending') {
+				RocketChat.models.Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
+			}
 		}
 	}
 
diff --git a/server/startup/initialData.js b/server/startup/initialData.js
index f3f4badf77f0..6d75ea21954a 100644
--- a/server/startup/initialData.js
+++ b/server/startup/initialData.js
@@ -143,6 +143,9 @@ Meteor.startup(function() {
 
 			if (oldestUser) {
 				RocketChat.authz.addUserRoles(oldestUser._id, 'admin');
+				if (RocketChat.settings.get('Show_Setup_Wizard') === 'pending') {
+					RocketChat.models.Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
+				}
 				console.log(`No admins are found. Set ${ oldestUser.username } as admin for being the oldest user`);
 			}
 		}
@@ -188,6 +191,10 @@ Meteor.startup(function() {
 
 			RocketChat.authz.addUserRoles(adminUser._id, 'admin');
 
+			if (RocketChat.settings.get('Show_Setup_Wizard') === 'pending') {
+				RocketChat.models.Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
+			}
+
 			return RocketChat.addUserToDefaultChannels(adminUser, true);
 		}
 	});
diff --git a/server/startup/migrations/v117.js b/server/startup/migrations/v117.js
index b6ea98760b2d..5ad49aa08c9b 100644
--- a/server/startup/migrations/v117.js
+++ b/server/startup/migrations/v117.js
@@ -1,14 +1,16 @@
 RocketChat.Migrations.add({
 	version: 117,
 	up() {
-		if (RocketChat &&
-		RocketChat.authz &&
-		RocketChat.authz.getUsersInRole('admin').count() &&
+		if (RocketChat.authz &&
 		RocketChat.models &&
-		RocketChat.models.Settings) {
+		RocketChat.models.Settings &&
+		RocketChat.authz.getUsersInRole('admin').count()) {
 			RocketChat.models.Settings.upsert(
-				{ _id: 'Show_Setup_Wizard' },
-				{ $set: { value: false }}
+				{
+					_id: 'Show_Setup_Wizard'
+				}, {
+					$set: { value: 'completed' }
+				}
 			);
 		}
 	}
diff --git a/server/startup/migrations/v119.js b/server/startup/migrations/v119.js
new file mode 100644
index 000000000000..005b9519fa80
--- /dev/null
+++ b/server/startup/migrations/v119.js
@@ -0,0 +1,20 @@
+RocketChat.Migrations.add({
+	version: 119,
+	up() {
+		if (RocketChat.models && RocketChat.models.Settings) {
+			RocketChat.models.Settings.update({
+				_id: 'Show_Setup_Wizard',
+				value: true
+			}, {
+				$set: { value: 'pending' }
+			});
+
+			RocketChat.models.Settings.update({
+				_id: 'Show_Setup_Wizard',
+				value: false
+			}, {
+				$set: { value: 'completed' }
+			});
+		}
+	}
+});
diff --git a/tests/end-to-end/ui/00-login.js b/tests/end-to-end/ui/00-login.js
index 9cda91c531a3..4cd6c69f86e6 100644
--- a/tests/end-to-end/ui/00-login.js
+++ b/tests/end-to-end/ui/00-login.js
@@ -3,9 +3,75 @@
 import loginPage from '../../pageobjects/login.page';
 import setupWizard from '../../pageobjects/setup-wizard.page';
 
+describe('[Login]', () => {
+	before(()=>{
+		loginPage.open();
+		// This Can Cause Timeouts erros if the server is slow so it should have a big wait
+		loginPage.emailOrUsernameField.waitForVisible(15000);
+	});
+
+	describe('[Render]', () => {
+		it('it should show email / username field', () => {
+			loginPage.emailOrUsernameField.isVisible().should.be.true;
+		});
+
+		it('it should show password field', () => {
+			loginPage.passwordField.isVisible().should.be.true;
+		});
+
+		it('it should show submit button', () => {
+			loginPage.submitButton.isVisible().should.be.true;
+		});
+
+		it('it should show register button', () => {
+			loginPage.registerButton.isVisible().should.be.true;
+		});
+
+		it('it should show forgot password button', () => {
+			loginPage.forgotPasswordButton.isVisible().should.be.true;
+		});
+
+		it('it should not show name field', () => {
+			loginPage.nameField.isVisible().should.be.false;
+		});
+
+		it('it should not show email field', () => {
+			loginPage.emailField.isVisible().should.be.false;
+		});
+
+		it('it should not show confirm password field', () => {
+			loginPage.confirmPasswordField.isVisible().should.be.false;
+		});
+
+		it('it should not show back to login button', () => {
+			loginPage.backToLoginButton.isVisible().should.be.false;
+		});
+	});
+
+	describe('[Required Fields]', () => {
+		before(() => {
+			loginPage.submit();
+		});
+
+		describe('email / username: ', () => {
+			it('it should be required', () => {
+				loginPage.emailOrUsernameField.getAttribute('class').should.contain('error');
+				loginPage.emailOrUsernameInvalidText.getText().should.not.be.empty;
+			});
+		});
+
+		describe('password: ', () => {
+			it('it should be required', () => {
+				loginPage.passwordField.getAttribute('class').should.contain('error');
+				loginPage.passwordInvalidText.getText().should.not.be.empty;
+			});
+		});
+	});
+});
+
 describe('[Setup Wizard]', () => {
 	before(()=>{
-		setupWizard.open();
+		setupWizard.login();
 		setupWizard.organizationType.waitForVisible(15000);
 	});
 
@@ -79,69 +145,3 @@ describe('[Setup Wizard]', () => {
 		});
 	});
 });
-
-describe('[Login]', () => {
-	before(()=>{
-		loginPage.open();
-		// This Can Cause Timeouts erros if the server is slow so it should have a big wait
-		loginPage.emailOrUsernameField.waitForVisible(15000);
-	});
-
-	describe('[Render]', () => {
-		it('it should show email / username field', () => {
-			loginPage.emailOrUsernameField.isVisible().should.be.true;
-		});
-
-		it('it should show password field', () => {
-			loginPage.passwordField.isVisible().should.be.true;
-		});
-
-		it('it should show submit button', () => {
-			loginPage.submitButton.isVisible().should.be.true;
-		});
-
-		it('it should show register button', () => {
-			loginPage.registerButton.isVisible().should.be.true;
-		});
-
-		it('it should show forgot password button', () => {
-			loginPage.forgotPasswordButton.isVisible().should.be.true;
-		});
-
-		it('it should not show name field', () => {
-			loginPage.nameField.isVisible().should.be.false;
-		});
-
-		it('it should not show email field', () => {
-			loginPage.emailField.isVisible().should.be.false;
-		});
-
-		it('it should not show confirm password field', () => {
-			loginPage.confirmPasswordField.isVisible().should.be.false;
-		});
-
-		it('it should not show back to login button', () => {
-			loginPage.backToLoginButton.isVisible().should.be.false;
-		});
-	});
-
-	describe('[Required Fields]', () => {
-		before(() => {
-			loginPage.submit();
-		});
-
-		describe('email / username: ', () => {
-			it('it should be required', () => {
-				loginPage.emailOrUsernameField.getAttribute('class').should.contain('error');
-				loginPage.emailOrUsernameInvalidText.getText().should.not.be.empty;
-			});
-		});
-
-		describe('password: ', () => {
-			it('it should be required', () => {
-				loginPage.passwordField.getAttribute('class').should.contain('error');
-				loginPage.passwordInvalidText.getText().should.not.be.empty;
-			});
-		});
-	});
-});
diff --git a/tests/pageobjects/setup-wizard.page.js b/tests/pageobjects/setup-wizard.page.js
index c114b3fb1812..593b9b646e75 100644
--- a/tests/pageobjects/setup-wizard.page.js
+++ b/tests/pageobjects/setup-wizard.page.js
@@ -15,8 +15,7 @@ class SetupWizard extends Page {
 	get language() { return browser.element('select[name="Language"]'); }
 	get serverType() { return browser.element('select[name="Server_Type"]'); }
 
-	open() {
-		super.open('setup-wizard');
+	login() {
 		browser.execute(function(email, password) {
 			Meteor.loginWithPassword(email, password, () => {});
 		}, adminEmail, adminPassword);