diff --git a/frontend/src/scripts/controllers/account-controller.js b/frontend/src/scripts/controllers/account-controller.js
index 4aabc8c87..6e8c15e56 100644
--- a/frontend/src/scripts/controllers/account-controller.js
+++ b/frontend/src/scripts/controllers/account-controller.js
@@ -633,7 +633,6 @@ async function signUp() {
     await createdAuthUser.user.updateProfile({ displayName: nname });
     await createdAuthUser.user.sendEmailVerification();
     AllTimeStats.clear();
-    Notifications.add("Account created", 1, 3);
     $("#menu .icon-button.account .text").text(nname);
     $(".pageLogin .button").removeClass("disabled");
     $(".pageLogin .preloader").addClass("hidden");
@@ -650,11 +649,12 @@ async function signUp() {
       }
     }
     PageController.change("account");
+    Notifications.add("Account created", 1, 3);
   } catch (e) {
     //make sure to do clean up here
     if (createdAuthUser) {
-      await createdAuthUser.user.delete();
       await Ape.users.delete();
+      await createdAuthUser.user.delete();
     }
     let txt;
     if (e.response) {
@@ -667,6 +667,7 @@ async function signUp() {
     Notifications.add(txt, -1);
     $(".pageLogin .preloader").addClass("hidden");
     $(".pageLogin .button").removeClass("disabled");
+    signOut();
     return;
   }
 }