--- a/src/com/beem/project/beem/ui/EditSettings.java	Mon Jun 01 20:49:45 2009 +0200
+++ b/src/com/beem/project/beem/ui/EditSettings.java	Mon Jun 01 21:04:35 2009 +0200
@@ -369,8 +369,6 @@
 	    startActivity(i);
 	    return true;
 	case R.id.settings_menu_login:
-	    BeemApplication beemApp = BeemApplication.getApplication(this);
-	    beemApp.stopBeemService();
 	    finish();
 	    return true;
 	}
@@ -509,5 +507,8 @@
 	    displayNotification(getText(R.string.settings_saved_ok));
 	    Log.i(getString(R.string.edit_settings_tag), LOG_MSG_SETTINGS_SAVED);
 	}
+	BeemApplication beemApp = BeemApplication.getApplication(this);
+	if (beemApp.isConnected())
+	    beemApp.stopBeemService();
     }
 }