--- a/src/com/beem/project/beem/BeemApplication.java	Sun Jan 06 18:27:57 2013 +0100
+++ b/src/com/beem/project/beem/BeemApplication.java	Mon Jan 07 14:42:41 2013 +0100
@@ -144,7 +144,8 @@
 	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
 	String login = mSettings.getString(BeemApplication.ACCOUNT_USERNAME_KEY, "");
 	String password = mSettings.getString(BeemApplication.ACCOUNT_PASSWORD_KEY, "");
-	mIsAccountConfigured = !("".equals(login) || "".equals(password));
+	boolean useSystemAccount = mSettings.getBoolean(BeemApplication.USE_SYSTEM_ACCOUNT_KEY, false);
+	mIsAccountConfigured = !TextUtils.isEmpty(login) && (useSystemAccount || !TextUtils.isEmpty((password)));
 	mSettings.registerOnSharedPreferenceChangeListener(mPreferenceListener);
 	SmileyParser.init(this);
     }