diff --git a/tests/end-to-end/ui/12-settings.js b/tests/end-to-end/ui/12-settings.js
index 3b6e66ab5c6..fc72f4ac02d 100644
--- a/tests/end-to-end/ui/12-settings.js
+++ b/tests/end-to-end/ui/12-settings.js
@@ -44,7 +44,7 @@ var settingValue = {
 	value : undefined
 };
 
-describe.only('Changing settings via api', () => {
+describe('Changing settings via api', () => {
 	before((done) => {
 		checkIfUserIsValid(username, email, password);
 		sideNav.spotlightSearch.waitForVisible(10000);
@@ -61,6 +61,11 @@ describe.only('Changing settings via api', () => {
 			.end(done);
 	});
 
+	after(() => {
+		sideNav.preferencesClose.waitForVisible(5000);
+		sideNav.preferencesClose.click();
+	});
+
 	it('/login', () => {
 		expect(credentials).to.have.property('X-Auth-Token').with.length.at.least(1);
 		expect(credentials).to.have.property('X-User-Id').with.length.at.least(1);
@@ -457,7 +462,7 @@ describe.only('Changing settings via api', () => {
 			loginPage.submit();
 
 			loginPage.registrationSucceededCard.waitForVisible(5000);
-			loginPage.registrationSucceededCard.getText().should.equal('Registration Succeeded');
+			loginPage.registrationSucceededCard.getText().toLowerCase().should.equal('registration succeeded');
 			loginPage.backToLoginButton.click();
 		});
 
@@ -476,6 +481,27 @@ describe.only('Changing settings via api', () => {
 			admin.usersFilter.setValue('setting'+username);
 		});
 
+		it('opens the user', () => {
+			const userEl = admin.getUserFromList('setting'+username);
+			userEl.waitForVisible(5000);
+			userEl.click();
+			flexTab.usersView.waitForVisible(5000);
+		});
+
+		it('should show the activate user btn', () => {
+			flexTab.usersActivate.waitForVisible(5000);
+			flexTab.usersActivate.isVisible().should.be.true;
+		});
+
+		it('should activate the user', () => {
+			flexTab.usersActivate.click();
+		});
+
+		it('should show the deactivate btn', () => {
+			flexTab.usersDeactivate.waitForVisible(5000);
+			flexTab.usersDeactivate.isVisible().should.be.true;
+		});
+
 		it('should change the Manually Approve New Users via api', (done) => {
 			request.post(api('settings/Accounts_ManuallyApproveNewUsers'))
 				.set(credentials)
diff --git a/tests/pageobjects/administration.page.js b/tests/pageobjects/administration.page.js
index 47e43566bbf..7ea5a7325f0 100644
--- a/tests/pageobjects/administration.page.js
+++ b/tests/pageobjects/administration.page.js
@@ -117,12 +117,18 @@ class Administration extends Page {
 	get generalUTF8NamesSlugReset() { return browser.element('.reset-setting[data-setting="UTF8_Names_Slugify"]'); }
 
 	checkUserList(user) {
-		var element = browser.element('td=adminCreated'+user);
+		const element = browser.element('td=adminCreated'+user);
 		element.waitForVisible(5000);
 		browser.pause(500);
-		var result = element.isVisible();
+		const result = element.isVisible();
 		return result[0];
 	}
+
+	getUserFromList(user) {
+		const element = browser.element('td='+user);
+		element.waitForVisible(5000);
+		return element;
+	}
 }
 
 module.exports = new Administration();
diff --git a/tests/pageobjects/flex-tab.page.js b/tests/pageobjects/flex-tab.page.js
index 5a6f3cd6a88..954e33d1a21 100644
--- a/tests/pageobjects/flex-tab.page.js
+++ b/tests/pageobjects/flex-tab.page.js
@@ -83,6 +83,10 @@ class FlexTab extends Page {
 	get usersAddUserRandomPassword() { return browser.element('#randomPassword'); }
 	get emojiNewAliases() { return browser.element('#aliases'); }
 	get emojiNewImageInput() { return browser.element('#image'); }
+	get usersView() { return browser.element('.user-view'); }
+	get usersEditUser() { return browser.element('.user-view .edit-user'); }
+	get usersActivate() { return browser.element('.button.activate'); }
+	get usersDeactivate() { return browser.element('.button.deactivate'); }
 
 	getUserEl(username) { return browser.element(`.flex-tab button[title="${username}"] > p`); }