diff --git a/NoteSkins/pump/default/NoteSkin.lua b/NoteSkins/pump/default/NoteSkin.lua
index 6baf5572b7..9f12249e34 100644
--- a/NoteSkins/pump/default/NoteSkin.lua
+++ b/NoteSkins/pump/default/NoteSkin.lua
@@ -118,6 +118,10 @@ local function func()
 		t.BaseRotationZ=Noteskin.BaseRotZ[sButton]
 	end
 	
+	if sElement == "Tap Lift" then
+		t.InitCommand=cmd(pulse);
+	end
+	
 	return t
 end
 
diff --git a/src/ScreenSMOnlineLogin.cpp b/src/ScreenSMOnlineLogin.cpp
index bca827b014..d748d60a0d 100644
--- a/src/ScreenSMOnlineLogin.cpp
+++ b/src/ScreenSMOnlineLogin.cpp
@@ -116,7 +116,16 @@ void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM)
 	else if( SM == SM_SMOnlinePack )
 	{
 		LOG->Trace("[ScreenSMOnlineLogin::HandleScreenMessage] SMOnlinePack");
-		sLoginQuestion = YOU_ARE_LOGGING_ON_AS.GetValue() + "\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n" + ENTER_YOUR_PASSWORD.GetValue();
+		if(!GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer))
+		{
+			LOG->Warn("Invalid player number: %i", m_iPlayer);
+			return;
+		}
+
+		// This can cause problems in certain situations -aj
+		sLoginQuestion = YOU_ARE_LOGGING_ON_AS.GetValue() + "\n"
+			+ GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n" +
+			ENTER_YOUR_PASSWORD.GetValue();
 		int ResponseCode = NSMAN->m_SMOnlinePacket.Read1();
 		if (ResponseCode == 0)
 		{