diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 109f2b1cf3..47c155aaf3 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -664,7 +664,7 @@ DefaultSort=Endless
 [ScreenSMOnlineLogin]
 Class=ScreenSMOnlineLogin
 Fallback=ScreenOptionsServiceChild
-NextScreen=ScreenNetRoom
+NextScreen=@SMOnlineScreen()
 PrevScreen=@ScreenTitleBranch()
 HelpText=
 StyleIcon=0
diff --git a/stepmania/src/ScreenSMOnlineLogin.cpp b/stepmania/src/ScreenSMOnlineLogin.cpp
index de547e7dd6..f91a0c5853 100644
--- a/stepmania/src/ScreenSMOnlineLogin.cpp
+++ b/stepmania/src/ScreenSMOnlineLogin.cpp
@@ -113,7 +113,9 @@ void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM)
 				if( GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer) && m_iPlayer < NUM_PLAYERS )
 					ScreenTextEntry::Password(SM_PasswordDone, "You are logging on as:\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\nPlease enter your password.", NULL );
 				else
-					SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 );
+				{
+					SCREENMAN->SetNewScreen( THEME->GetMetric (m_sName,"NextScreen") );
+				}
 			}
 			else
 			{
@@ -150,11 +152,6 @@ void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM)
 		}
 		return;
 	}
-	else if( SM == SM_GoToPrevScreen )
-	{
-		SCREENMAN->PostMessageToTopScreen( SM_GoToPrevScreen, 0 );
-		return;
-	}
 
 	ScreenOptions::HandleScreenMessage(SM);
 }
@@ -201,7 +198,7 @@ void ScreenSMOnlineLogin::SendLogin(CString sPassword)
 #endif
 
 /*
- * (c) 2004 Charles Lohr Adam Lowman
+ * (c) 2004-2005 Charles Lohr Adam Lowman
  * All rights reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a