diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/ServerSettingsFragment.java b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/ServerSettingsFragment.java
index 536e6fc4..ccc01852 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/ServerSettingsFragment.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/ServerSettingsFragment.java
@@ -193,20 +193,20 @@ public class ServerSettingsFragment extends PreferenceFragment
 
     private void updatePassword() {
         serverPasswordPref.setText(sharedPreferences
-                .getString(Constants.PREFERENCES_KEY_PASSWORD + serverId, "***"));
-        serverPasswordPref.setSummary("***");
+                .getString(Constants.PREFERENCES_KEY_PASSWORD + serverId,
+                        ""));
     }
 
     private void updateUsername() {
         serverUsernamePref.setText(sharedPreferences
                 .getString(Constants.PREFERENCES_KEY_USERNAME + serverId,
-                        getString(R.string.settings_server_username)));
+                        ""));
     }
 
     private void updateUrl() {
         final String serverUrl = sharedPreferences
                 .getString(Constants.PREFERENCES_KEY_SERVER_URL + serverId,
-                        getString(R.string.settings_server_address_unset));
+                        "http://");
         serverUrlPref.setText(serverUrl);
         serverUrlPref.setSummary(serverUrl);
     }
@@ -214,7 +214,7 @@ public class ServerSettingsFragment extends PreferenceFragment
     private void updateName() {
         final String serverName = sharedPreferences
                 .getString(Constants.PREFERENCES_KEY_SERVER_NAME + serverId,
-                        getString(R.string.settings_server_unused));
+                        "");
         serverNamePref.setText(serverName);
         serverNamePref.setSummary(serverName);
     }
diff --git a/ultrasonic/src/main/res/xml/server_settings.xml b/ultrasonic/src/main/res/xml/server_settings.xml
index 46ea55dd..6990d52a 100644
--- a/ultrasonic/src/main/res/xml/server_settings.xml
+++ b/ultrasonic/src/main/res/xml/server_settings.xml
@@ -29,7 +29,6 @@
         android:key="@string/settings.server_password"
         android:persistent="false"
         android:inputType="textPassword"
-        android:summary="***"
         android:title="@string/settings.server_password"
         />
     <CheckBoxPreference