--- a/src/com/beem/project/beem/BeemService.java	Sun Sep 27 17:59:13 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Sun Sep 27 17:51:06 2009 +0200
@@ -98,6 +98,14 @@
 	Log.e("BEEMSERVICE", "ONBIND()");
 	return mBind;
     }
+    
+    @Override
+    public boolean onUnbind(Intent intent) {
+	if (!mConnection.getAdaptee().isConnected()) {
+	    this.stopSelf();
+	}	    
+	return true;
+    }
 
     /**
      * {@inheritDoc}

--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Sun Sep 27 17:59:13 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Sun Sep 27 17:51:06 2009 +0200
@@ -320,7 +320,7 @@
 		}
 	    }
 	    mRemoteConnListeners.finishBroadcast();
-	    //mService.stopSelf();
+	    mService.stopSelf();
 	}
 
 	/**

--- a/src/com/beem/project/beem/ui/Login.java	Sun Sep 27 17:59:13 2009 +0200
+++ b/src/com/beem/project/beem/ui/Login.java	Sun Sep 27 17:51:06 2009 +0200
@@ -81,23 +81,13 @@
 	setContentView(R.layout.login);
 	mProgressDialog = new ProgressDialog(this);
     }
-
+    
     /**
      * {@inheritDoc}
      */
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-	super.onActivityResult(requestCode, resultCode, data);
-	if (requestCode == REQUEST_CODE) {
-	    if (resultCode == 69) {
-		stopService(SERVICE_INTENT);
-	    }
-	}
-    }
-
-    @Override
-    protected void onDestroy() {
-	super.onDestroy();
+    protected void onStop() {
+	super.onStop();
 	if (mIsConfigured && (mIsConnected || mXmppFacade != null)) {
 	    unbindService(mServConn);
 	}
@@ -118,6 +108,19 @@
      * {@inheritDoc}
      */
     @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+	super.onActivityResult(requestCode, resultCode, data);
+	if (requestCode == REQUEST_CODE) {
+	    if (resultCode == 69) {
+		stopService(SERVICE_INTENT);
+	    }
+	}
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public boolean onCreateOptionsMenu(Menu menu) {
 	super.onCreateOptionsMenu(menu);
 	MenuInflater inflater = getMenuInflater();