--- jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua	(revision 29842)
+++ jive/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua	(local)
@@ -1225,13 +1225,19 @@
 
 
 	-- if connecting to SqueezeNetwork, first check jive is linked
-	if slimserver:getPin() then
-		local snpin = appletManager:loadApplet("SqueezeNetworkPIN")
-		snpin:enterPin(slimserver, nil,
-			       function()
-				       self:_registerPlayer(slimserver)
-			       end)
+	if slimserver:isSqueezeNetwork() then
+		if slimserver:getPin() then
+			local snpin = appletManager:loadApplet("SqueezeNetworkPIN")
+			snpin:enterPin(slimserver, nil,
+				       function()
+					       self:_registerPlayer(slimserver)
+				       end)
 
+			return
+		else
+			self:_registerPlayer(slimserver)
+		end
+		
 		return
 	end