diff --git a/satellite/console/consoleweb/consoleapi/auth.go b/satellite/console/consoleweb/consoleapi/auth.go
index 13a256846c4d..f0a487dd3eb8 100644
--- a/satellite/console/consoleweb/consoleapi/auth.go
+++ b/satellite/console/consoleweb/consoleapi/auth.go
@@ -399,6 +399,12 @@ func (a *Auth) Register(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if a.ActivationCodeEnabled {
+		*user, err = a.service.SetActivationCodeAndSignupID(ctx, *user)
+		if err != nil {
+			a.serveJSONError(ctx, w, err)
+			return
+		}
+
 		a.mailService.SendRenderedAsync(
 			ctx,
 			[]post.Address{{Address: user.Email}},
diff --git a/web/satellite/vuetify-poc/src/components/dialogs/upgradeAccountFlow/AddTokensStep.vue b/web/satellite/vuetify-poc/src/components/dialogs/upgradeAccountFlow/AddTokensStep.vue
index 4c85d8d7de3c..d09ed496f4e5 100644
--- a/web/satellite/vuetify-poc/src/components/dialogs/upgradeAccountFlow/AddTokensStep.vue
+++ b/web/satellite/vuetify-poc/src/components/dialogs/upgradeAccountFlow/AddTokensStep.vue
@@ -2,7 +2,10 @@
 // See LICENSE for copying information.
 
 <template>
-    <p class="text-body-2 mb-4">
+    <p v-if="isPaidTier" class="text-body-2 mb-4">
+        Send STORJ Tokens to the following deposit address to credit your Storj account:
+    </p>
+    <p v-else class="text-body-2 mb-4">
         Send more than $10 in STORJ Tokens to the following deposit address to upgrade to a Pro account.
         Your account will be upgraded after your transaction receives {{ neededConfirmations }} confirmations.
         If your account is not automatically upgraded, please fill out this
@@ -140,6 +143,11 @@ const pendingPayments = computed((): PaymentWithConfirmations[] => {
     return billingStore.state.pendingPaymentsWithConfirmations;
 });
 
+/**
+ * Returns whether the user is in paid tier.
+ */
+const isPaidTier = computed((): boolean => usersStore.state.user.paidTier);
+
 /**
  * Copies address to user's clipboard.
  */
@@ -173,7 +181,7 @@ watch(() => pendingPayments.value, async () => {
     clearInterval(intervalID.value);
     billingStore.clearPendingPayments();
 
-    if (usersStore.state.user.paidTier) {
+    if (isPaidTier.value) {
         // in case this step was entered in to directly from
         // the billing/payment method tab when the user is
         // already in paid tier.
@@ -184,7 +192,7 @@ watch(() => pendingPayments.value, async () => {
     await usersStore.getUser();
 
     // we redirect to success step only if user status was updated to Paid Tier.
-    if (usersStore.state.user.paidTier) {
+    if (isPaidTier.value) {
         // arbitrary delay to allow for user to read success banner.
         await new Promise(resolve => setTimeout(resolve, 2000));
         emit('success');
diff --git a/web/satellite/vuetify-poc/src/views/ForgotPassword.vue b/web/satellite/vuetify-poc/src/views/ForgotPassword.vue
index a110d5cccba3..d47ac1b080f0 100644
--- a/web/satellite/vuetify-poc/src/views/ForgotPassword.vue
+++ b/web/satellite/vuetify-poc/src/views/ForgotPassword.vue
@@ -58,7 +58,8 @@
                                 color="primary"
                                 size="large"
                                 block
-                                :disabled="isLoading || !formValid"
+                                :loading="isLoading"
+                                :disabled="!formValid"
                                 @click="onPasswordReset"
                             >
                                 Request Password Reset
diff --git a/web/satellite/vuetify-poc/src/views/SignupConfirmation.vue b/web/satellite/vuetify-poc/src/views/SignupConfirmation.vue
index cb1895fed64a..6b06c660b423 100644
--- a/web/satellite/vuetify-poc/src/views/SignupConfirmation.vue
+++ b/web/satellite/vuetify-poc/src/views/SignupConfirmation.vue
@@ -97,6 +97,7 @@ import { useUsersStore } from '@/store/modules/usersStore';
 import { LocalData } from '@/utils/localData';
 import { ErrorUnauthorized } from '@/api/errors/ErrorUnauthorized';
 import { useAnalyticsStore } from '@/store/modules/analyticsStore';
+import { useAppStore } from '@poc/store/appStore';
 
 import IconBlueCheckmark from '@poc/components/icons/IconBlueCheckmark.vue';
 
@@ -110,6 +111,7 @@ const props = withDefaults(defineProps<{
 
 const auth: AuthHttpApi = new AuthHttpApi();
 
+const appStore = useAppStore();
 const analyticsStore = useAnalyticsStore();
 const configStore = useConfigStore();
 const usersStore = useUsersStore();
@@ -170,6 +172,7 @@ function resendMail(): void {
 
         try {
             signupId.value = await auth.resendEmail(email);
+            code.value = '';
         } catch (error) {
             notify.notifyError(error);
         }
@@ -201,6 +204,7 @@ function verifyCode(): void {
             return;
         }
 
+        appStore.toggleHasJustLoggedIn(true);
         usersStore.login();
         analyticsStore.pageVisit('/projects');
         await router.push('/projects');