diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepViewModel.cs
index d2b1a1a5f..1321df067 100644
--- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/ValidateEmailStepViewModel.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Reactive;
 using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
@@ -24,7 +24,7 @@ public class ValidateEmailStepViewModel : SubmissionViewModel
     {
         _authenticationService = authenticationService;
 
-        Continue = ReactiveCommand.Create(ExecuteContinue);
+        Continue = ReactiveCommand.Create(() =>{}, Observable.Never<bool>());
         Refresh = ReactiveCommand.CreateFromTask(ExecuteRefresh);
         Resend = ReactiveCommand.Create(() => Utilities.OpenUrl(WorkshopConstants.AUTHORITY_URL + "/account/confirm/resend"));
 
@@ -55,7 +55,7 @@ public class ValidateEmailStepViewModel : SubmissionViewModel
             // Use the refresh token to login again, updating claims
             await _authenticationService.AutoLogin(true);
             if (_authenticationService.GetIsEmailVerified())
-                ExecuteContinue();
+                State.ChangeScreen<EntryTypeStepViewModel>();
         }
         catch (Exception)
         {
@@ -63,11 +63,6 @@ public class ValidateEmailStepViewModel : SubmissionViewModel
         }
     }
 
-    private void ExecuteContinue()
-    {
-        State.ChangeScreen<EntryTypeStepViewModel>();
-    }
-
     private async Task ExecuteRefresh(CancellationToken ct)
     {
         await Update();