diff --git a/e2e/data.js b/e2e/data.js
index fa153468d..d3f4a0df9 100644
--- a/e2e/data.js
+++ b/e2e/data.js
@@ -9,23 +9,23 @@ const data = {
         regular: {
             username: `userone${ value }`,
             password: '123',
-            email: `diego.mello+regular${ value }@rocket.chat`
+            email: `mobile+regular${ value }@rocket.chat`
         },
         alternate: {
             username: `usertwo${ value }`,
             password: '123',
-            email: `diego.mello+alternate${ value }@rocket.chat`,
+            email: `mobile+alternate${ value }@rocket.chat`,
             totpSecret: 'NA4GOMZGHBQSK6KEFRVT62DMGJJGSYZJFZIHO3ZOGVXWCYZ6MMZQ'
         },
         profileChanges: {
             username: `userthree${ value }`,
             password: '123',
-            email: `diego.mello+profileChanges${ value }@rocket.chat`
+            email: `mobile+profileChanges${ value }@rocket.chat`
         },
         existing: {
             username: `existinguser${ value }`,
             password: '123',
-            email: `diego.mello+existing${ value }@rocket.chat`
+            email: `mobile+existing${ value }@rocket.chat`
         }
     },
     channels: {
@@ -41,7 +41,7 @@ const data = {
     registeringUser: {
         username: `newuser${ value }`,
         password: `password${ value }`,
-        email: `diego.mello+registering${ value }@rocket.chat`
+        email: `mobile+registering${ value }@rocket.chat`
     },
     random: value
 }
diff --git a/e2e/data/data.cloud.js b/e2e/data/data.cloud.js
index fa153468d..d3f4a0df9 100644
--- a/e2e/data/data.cloud.js
+++ b/e2e/data/data.cloud.js
@@ -9,23 +9,23 @@ const data = {
         regular: {
             username: `userone${ value }`,
             password: '123',
-            email: `diego.mello+regular${ value }@rocket.chat`
+            email: `mobile+regular${ value }@rocket.chat`
         },
         alternate: {
             username: `usertwo${ value }`,
             password: '123',
-            email: `diego.mello+alternate${ value }@rocket.chat`,
+            email: `mobile+alternate${ value }@rocket.chat`,
             totpSecret: 'NA4GOMZGHBQSK6KEFRVT62DMGJJGSYZJFZIHO3ZOGVXWCYZ6MMZQ'
         },
         profileChanges: {
             username: `userthree${ value }`,
             password: '123',
-            email: `diego.mello+profileChanges${ value }@rocket.chat`
+            email: `mobile+profileChanges${ value }@rocket.chat`
         },
         existing: {
             username: `existinguser${ value }`,
             password: '123',
-            email: `diego.mello+existing${ value }@rocket.chat`
+            email: `mobile+existing${ value }@rocket.chat`
         }
     },
     channels: {
@@ -41,7 +41,7 @@ const data = {
     registeringUser: {
         username: `newuser${ value }`,
         password: `password${ value }`,
-        email: `diego.mello+registering${ value }@rocket.chat`
+        email: `mobile+registering${ value }@rocket.chat`
     },
     random: value
 }
diff --git a/e2e/data/data.docker.js b/e2e/data/data.docker.js
index 95f31ca9f..a22423a63 100644
--- a/e2e/data/data.docker.js
+++ b/e2e/data/data.docker.js
@@ -9,23 +9,23 @@ const data = {
         regular: {
             username: `userone${ value }`,
             password: '123',
-            email: `diego.mello+regular${ value }@rocket.chat`
+            email: `mobile+regular${ value }@rocket.chat`
         },
         alternate: {
             username: `usertwo${ value }`,
             password: '123',
-            email: `diego.mello+alternate${ value }@rocket.chat`,
+            email: `mobile+alternate${ value }@rocket.chat`,
             totpSecret: 'NA4GOMZGHBQSK6KEFRVT62DMGJJGSYZJFZIHO3ZOGVXWCYZ6MMZQ'
         },
         profileChanges: {
             username: `userthree${ value }`,
             password: '123',
-            email: `diego.mello+profileChanges${ value }@rocket.chat`
+            email: `mobile+profileChanges${ value }@rocket.chat`
         },
         existing: {
             username: `existinguser${ value }`,
             password: '123',
-            email: `diego.mello+existing${ value }@rocket.chat`
+            email: `mobile+existing${ value }@rocket.chat`
         }
     },
     channels: {
@@ -41,7 +41,7 @@ const data = {
     registeringUser: {
         username: `newuser${ value }`,
         password: `password${ value }`,
-        email: `diego.mello+registering${ value }@rocket.chat`
+        email: `mobile+registering${ value }@rocket.chat`
     },
     random: value
 }
diff --git a/e2e/docker/controlRCDemoEnv.sh b/e2e/docker/controlRCDemoEnv.sh
index 16dc49a7a..527d837e3 100755
--- a/e2e/docker/controlRCDemoEnv.sh
+++ b/e2e/docker/controlRCDemoEnv.sh
@@ -42,7 +42,7 @@ if [ "$COMMAND" == "start" ]; then
         MAX_ATTEMPTS=60
         while [ $ATTEMPT_NUMBER -lt $MAX_ATTEMPTS ]; do # https://stackoverflow.com/a/21189312/399007
             ATTEMPT_NUMBER=$((ATTEMPT_NUMBER + 1 ))
-            echo "Waiting for server to be up ($ATTEMPT_NUMBER of $MAX_ATTEMPTS)"
+            echo "Checking if servers are ready (attempt $ATTEMPT_NUMBER of $MAX_ATTEMPTS)"
             LOGS=$(docker logs rc_test_env_rocketchat_1  2> /dev/null)
             if grep -q 'SERVER RUNNING' <<< $LOGS ; then
                 echo "RocketChat is ready!"
diff --git a/e2e/tests/assorted/03-profile.spec.js b/e2e/tests/assorted/03-profile.spec.js
index a000f6437..9700da1b2 100644
--- a/e2e/tests/assorted/03-profile.spec.js
+++ b/e2e/tests/assorted/03-profile.spec.js
@@ -85,7 +85,7 @@ describe('Profile screen', () => {
 		});
 
 		it('should change email and password', async() => {
-			await element(by.id('profile-view-email')).replaceText(`diego.mello+profileChangesNew${ data.random }@rocket.chat`);
+			await element(by.id('profile-view-email')).replaceText(`mobile+profileChangesNew${ data.random }@rocket.chat`);
 			await element(by.id('profile-view-new-password')).replaceText(`${ profileChangeUser.password }new`);
 			await element(by.id('profile-view-submit')).tap();
 			await element(by.type('_UIAlertControllerTextField')).replaceText(`${ profileChangeUser.password }`)