--- a/src/com/beem/project/beem/ui/CreateAccount.java	Mon Dec 21 20:36:18 2009 +0100
+++ b/src/com/beem/project/beem/ui/CreateAccount.java	Mon Dec 21 21:04:06 2009 +0100
@@ -63,6 +63,7 @@
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.R.drawable;
 
 import com.beem.project.beem.R;
 
@@ -139,7 +140,7 @@
      */
     private void createErrorDialog(String errMsg) {
 	AlertDialog.Builder builder = new AlertDialog.Builder(this);
-	builder.setTitle(R.string.create_account_err_dialog_title).setMessage(errMsg).setCancelable(false);
+	builder.setTitle(R.string.create_account_err_dialog_title).setMessage(errMsg).setCancelable(false).setIcon(android.R.drawable.ic_dialog_alert);
 	builder.setNeutralButton(R.string.create_account_close_dialog_button, new DialogInterface.OnClickListener() {
 
 	    @Override
@@ -193,20 +194,17 @@
      * @return Registered proxy type
      */
     private ProxyInfo.ProxyType getRegisteredProxyType() {
-	ProxyInfo.ProxyType result;
-	switch (mSettings.getInt("settings_key_proxy_type", DEFAULT_INT_VALUE)) {
-	    case 0:
+	ProxyInfo.ProxyType result = ProxyInfo.ProxyType.NONE;
+	if (mSettings.getBoolean("settings_key_proxy_use", false)) {
+	    String type = mSettings.getString("settings_key_proxy_type", "none");
+	    if ("HTTP".equals(type))
 		result = ProxyInfo.ProxyType.HTTP;
-		break;
-	    case 1:
+	    else if ("SOCKS4".equals(type))
 		result = ProxyInfo.ProxyType.SOCKS4;
-		break;
-	    case 2:
+	    else if ("SOCKS5".equals(type))
 		result = ProxyInfo.ProxyType.SOCKS5;
-		break;
-	    default:
+	    else
 		result = ProxyInfo.ProxyType.NONE;
-		break;
 	}
 	return result;
     }