diff --git a/backend/src/middleware/email/templates/signup.html b/backend/src/middleware/email/templates/signup.html
index f4155a91e..4bf17fd61 100644
--- a/backend/src/middleware/email/templates/signup.html
+++ b/backend/src/middleware/email/templates/signup.html
@@ -7,8 +7,8 @@
     <td style="background-color: #ffffff;">
       <img
         src="{{{ welcomeImageUrl }}}"
-        width="600" height="" alt="Welcome image" border="0"
-        style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;"
+        width="300" height="" alt="Welcome image" border="0"
+        style="width: 100%; max-width: 300px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block; padding: 20px;"
         class="g-img">
     </td>
   </tr>
@@ -118,8 +118,8 @@
     <td style="background-color: #ffffff;">
       <img
         src="{{{ welcomeImageUrl }}}"
-        width="600" height="" alt="Welcome image" border="0"
-        style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;"
+        width="300" height="" alt="Welcome image" border="0"
+        style="width: 100%; max-width: 300px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block; padding: 20px;"
         class="g-img">
     </td>
   </tr>
diff --git a/backend/src/schema/resolvers/registration.js b/backend/src/schema/resolvers/registration.js
index 075f65554..2796028fe 100644
--- a/backend/src/schema/resolvers/registration.js
+++ b/backend/src/schema/resolvers/registration.js
@@ -72,10 +72,10 @@ const signupCypher = (inviteCode) => {
       (inviteCode:InviteCode {code: $inviteCode})<-[:GENERATED]-(host:User)
       `
     optionalMerge = `
-      MERGE(user)-[:REDEEMED]->(inviteCode)
-      MERGE(host)-[:INVITED]->(user)
-      MERGE(user)-[:FOLLOWS]->(host)
-      MERGE(host)-[:FOLLOWS]->(user)
+      MERGE(user)-[:REDEEMED { createdAt: toString(datetime()) }]->(inviteCode)
+      MERGE(host)-[:INVITED { createdAt: toString(datetime()) }]->(user)
+      MERGE(user)-[:FOLLOWS { createdAt: toString(datetime()) }]->(host)
+      MERGE(host)-[:FOLLOWS { createdAt: toString(datetime()) }]->(user)
       `
   }
   const cypher = `
diff --git a/webapp/components/Registration/RegistrationSlider.vue b/webapp/components/Registration/RegistrationSlider.vue
index b4a180ecf..0e3ae17a4 100644
--- a/webapp/components/Registration/RegistrationSlider.vue
+++ b/webapp/components/Registration/RegistrationSlider.vue
@@ -67,6 +67,7 @@ export default {
   props: {
     registrationType: { type: String, required: true },
     overwriteSliderData: { type: Object, default: () => {} },
+    activePage: { type: String, default: null, required: false },
   },
   data() {
     const slidersPortfolio = {
@@ -172,7 +173,8 @@ export default {
           termsAndConditionsConfirmed: null,
           recieveCommunicationAsEmailsEtcConfirmed: null,
         },
-        sliderIndex: 0,
+        sliderIndex:
+          this.activePage === null ? 0 : sliders.findIndex((el) => el.name === this.activePage),
         sliders: sliders,
         sliderSelectorCallback: this.sliderSelectorCallback,
         setSliderValuesCallback: this.setSliderValuesCallback,
diff --git a/webapp/pages/registration.vue b/webapp/pages/registration.vue
index 6d8818d07..9c498093c 100644
--- a/webapp/pages/registration.vue
+++ b/webapp/pages/registration.vue
@@ -1,6 +1,7 @@
 <template>
   <registration-slider
-    :registrationType="registrationType"
+    :registrationType="registrationType.method"
+    :activePage="registrationType.activePage"
     :overwriteSliderData="overwriteSliderData"
   />
 </template>
@@ -39,18 +40,25 @@ export default {
     registrationType() {
       if (!this.method) {
         return (
-          (this.publicRegistration && 'public-registration') ||
-          (this.inviteRegistration && 'invite-code') ||
-          'no-public-registration'
+          (this.publicRegistration && { method: 'public-registration', activePage: null }) ||
+          (this.inviteRegistration && { method: 'invite-code', activePage: null }) || {
+            method: 'no-public-registration',
+            activePage: null,
+          }
         )
       } else {
         if (
           this.method === 'invite-mail' ||
           (this.method === 'invite-code' && this.inviteRegistration)
         ) {
-          return this.method
+          if (this.method === 'invite-code' && this.inviteCode && this.nonce && this.email)
+            return { method: this.method, activePage: 'enter-nonce' }
+          return { method: this.method, activePage: null }
+        }
+        return {
+          method: this.publicRegistration ? 'public-registration' : 'no-public-registration',
+          activePage: null,
         }
-        return this.publicRegistration ? 'public-registration' : 'no-public-registration'
       }
     },
   },