--- a/res/xml/preferences.xml	Mon Sep 24 23:41:26 2012 +0200
+++ b/res/xml/preferences.xml	Tue Sep 25 21:17:40 2012 +0200
@@ -81,13 +81,9 @@
 		</PreferenceScreen>
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/user_preferences">
-		<EditTextPreference android:singleLine="true"
-			android:summary="@string/SettingsText" android:title="@string/settings_account_username"
-			android:key="account_username" android:hint="@string/login_username_info_default"
-			android:inputType="textEmailAddress" />
-		<EditTextPreference android:name="password"
-			android:singleLine="true" android:password="true" android:summary="@string/SettingsPassword"
-			android:title="@string/settings_account_password" android:key="account_password" />
+	    <Preference android:key="account_username" android:title="@string/settings_account_username">
+	        <intent android:targetPackage="com.beem.project.beem" android:targetClass="com.beem.project.beem.ui.wizard.Account" />
+	    </Preference>
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/user_preferences_advanced">
 		<EditTextPreference android:key="connection_resource"