diff --git a/SafeExamBrowser.Client/ClientController.cs b/SafeExamBrowser.Client/ClientController.cs
index b0220554..f0b3b3bb 100644
--- a/SafeExamBrowser.Client/ClientController.cs
+++ b/SafeExamBrowser.Client/ClientController.cs
@@ -429,7 +429,7 @@ namespace SafeExamBrowser.Client
 
 			var exams = args.Exams.Select(e => new Exam { Id = e.id, LmsName = e.lms, Name = e.name, Url = e.url });
 			var dialog = uiFactory.CreateExamSelectionDialog(exams);
-			var result = dialog.Show(splashScreen);
+			var result = dialog.Show();
 
 			runtime.SubmitExamSelectionResult(args.RequestId, result.Success, result.SelectedExam?.Id);
 			logger.Info($"Exam selection request with id '{args.RequestId}' is complete.");
diff --git a/SafeExamBrowser.Runtime/Operations/ServerOperation.cs b/SafeExamBrowser.Runtime/Operations/ServerOperation.cs
index 3c64f037..da111dba 100644
--- a/SafeExamBrowser.Runtime/Operations/ServerOperation.cs
+++ b/SafeExamBrowser.Runtime/Operations/ServerOperation.cs
@@ -146,6 +146,10 @@ namespace SafeExamBrowser.Runtime.Operations
 				Context.Next.Settings.Server = Context.Current.Settings.Server;
 				Context.Next.Settings.SessionMode = SessionMode.Server;
 			}
+			else if (Context.Next.Settings.SessionMode == SessionMode.Server)
+			{
+				return Perform();
+			}
 
 			return OperationResult.Success;
 		}