--- a/AndroidManifest.xml	Mon Jun 01 14:58:03 2009 +0200
+++ b/AndroidManifest.xml	Mon Jun 01 16:54:11 2009 +0200
@@ -5,11 +5,11 @@
 	<application android:label="@string/app_name" android:name="BeemApplication"
 		android:icon="@drawable/signal"
 		android:theme="@style/Theme.BEEM.Default">
-		<activity android:name=".ui.Login" android:label="@string/app_name">
+		<activity android:name=".ui.Login" android:label="@string/app_name"
+			android:launchMode="singleTop">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
-				<category android:name="android.intent.category.ACCOUNT_CREATE" />
 			</intent-filter>
 		</activity>
 		<activity android:name=".ui.ContactListSettings"

--- a/src/com/beem/project/beem/ui/EditSettings.java	Mon Jun 01 14:58:03 2009 +0200
+++ b/src/com/beem/project/beem/ui/EditSettings.java	Mon Jun 01 16:54:11 2009 +0200
@@ -349,8 +349,7 @@
 	    startActivity(i);
 	    return true;
 	case R.id.settings_menu_login:
-	    i = new Intent(this, Login.class);
-	    startActivity(i);
+	    finish();
 	    return true;
 	}
 	return false;