--- a/res/layout/create_account.xml	Tue Sep 25 22:40:22 2012 +0200
+++ b/res/layout/create_account.xml	Sat Sep 29 04:47:42 2012 +0200
@@ -12,16 +12,36 @@
 		android:layout_marginTop="15dp"
 		android:layout_marginBottom="30dp"
 		android:src="@drawable/logo"/>
-	    
+	   
+	    <TextView
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:text="@string/create_account_text"
+		android:textSize="18sp"
+		android:paddingBottom="10dip"
+		android:focusable="true" />
 		<TextView
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:text="@string/create_account_username" style="@style/Label" />
-		<EditText android:id="@+id/create_account_username"
-			android:inputType="textEmailAddress" android:imeOptions="actionNext"
-			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:singleLine="true"
-			android:hint="beem@beem-project.com "
-			android:contentDescription="@string/create_account_username"/>
+		<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" 
+		    android:orientation="horizontal">
+			<EditText android:id="@+id/create_account_username"
+				android:inputType="textEmailAddress" android:imeOptions="actionNext"
+				android:layout_width="wrap_content" android:layout_height="wrap_content"
+				android:singleLine="true"
+				android:minWidth="120dp"
+				android:hint="beem"
+				android:contentDescription="@string/create_account_username"/>
+			<TextView
+				android:layout_width="wrap_content" android:layout_height="wrap_content"
+				android:text=" @ " style="@style/Label" />
+		<AutoCompleteTextView android:id="@+id/xmpp_server"
+		    android:layout_width="wrap_content" android:layout_height="wrap_content"
+			android:minWidth="160dp"
+		    android:gravity="left"
+		    android:hint="beem-project.com"
+		    android:inputType="textNoSuggestions"
+		    style="?android:attr/dropDownSpinnerStyle"/>
+		</LinearLayout>
 		<TextView
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:text="@string/create_account_password" style="@style/Label" />
@@ -38,7 +58,10 @@
 			android:inputType="textPassword" android:imeOptions="actionNext"
 			android:singleLine="true"
 			android:contentDescription="@string/create_account_confirm_password"/>
-
+		<TextView android:id="@+id/error_label"
+				android:layout_width="fill_parent" android:layout_height="wrap_content"
+				android:textColor="@color/red" android:textStyle="bold"
+				style="@style/Label"/>
 	</LinearLayout>
 	</ScrollView>