diff --git a/app/src/main/java/net/nullsum/audinaut/fragments/SettingsFragment.java b/app/src/main/java/net/nullsum/audinaut/fragments/SettingsFragment.java
index 2747e8e..f5638ee 100644
--- a/app/src/main/java/net/nullsum/audinaut/fragments/SettingsFragment.java
+++ b/app/src/main/java/net/nullsum/audinaut/fragments/SettingsFragment.java
@@ -28,6 +28,7 @@ import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.text.InputType;
 import android.util.Log;
 import android.view.View;
@@ -469,6 +470,12 @@ public class SettingsFragment extends PreferenceCompatFragment implements Shared
         serverPasswordPreference.setSummary("***");
         serverPasswordPreference.setTitle(R.string.settings_server_password);
 
+        final SwitchPreference authMethodPreference = new SwitchPreference(context);
+        authMethodPreference.setKey(Constants.PREFERENCES_KEY_AUTH_METHOD + instance);
+        authMethodPreference.setSummary(R.string.settings_auth_summary);
+        authMethodPreference.setDefaultValue(true); // use Token/Salt by default
+        authMethodPreference.setTitle(R.string.settings_auth_method);
+
         final Preference serverOpenBrowser = new Preference(context);
         serverOpenBrowser.setKey(Constants.PREFERENCES_KEY_OPEN_BROWSER);
         serverOpenBrowser.setPersistent(false);
@@ -529,6 +536,7 @@ public class SettingsFragment extends PreferenceCompatFragment implements Shared
         screen.addPreference(serverLocalNetworkSSIDPreference);
         screen.addPreference(serverUsernamePreference);
         screen.addPreference(serverPasswordPreference);
+        screen.addPreference(authMethodPreference);
         screen.addPreference(serverTestConnectionPreference);
         screen.addPreference(serverOpenBrowser);
         screen.addPreference(serverRemoveServerPreference);
diff --git a/app/src/main/java/net/nullsum/audinaut/util/Constants.java b/app/src/main/java/net/nullsum/audinaut/util/Constants.java
index 5675fe6..84d09c7 100644
--- a/app/src/main/java/net/nullsum/audinaut/util/Constants.java
+++ b/app/src/main/java/net/nullsum/audinaut/util/Constants.java
@@ -71,6 +71,7 @@ public final class Constants {
     public static final String PREFERENCES_KEY_MUSIC_FOLDER_ID = "musicFolderId";
     public static final String PREFERENCES_KEY_USERNAME = "username";
     public static final String PREFERENCES_KEY_PASSWORD = "password";
+    public static final String PREFERENCES_KEY_AUTH_METHOD = "authMethod";
     public static final String PREFERENCES_KEY_THEME = "theme";
     public static final String PREFERENCES_KEY_FULL_SCREEN = "fullScreen";
     public static final String PREFERENCES_KEY_DISPLAY_TRACK = "displayTrack";
diff --git a/app/src/main/java/net/nullsum/audinaut/util/Util.java b/app/src/main/java/net/nullsum/audinaut/util/Util.java
index e992691..b7a4a1b 100644
--- a/app/src/main/java/net/nullsum/audinaut/util/Util.java
+++ b/app/src/main/java/net/nullsum/audinaut/util/Util.java
@@ -326,18 +326,24 @@ public final class Util {
         builder.addPathSegment("rest");
         builder.addPathSegment(method + ".view");
 
-        int hash = (username + password).hashCode();
-        Pair<String, String> values = tokens.get(hash);
-        if (values == null) {
-            String salt = new BigInteger(130, getRandom()).toString(32);
-            String token = md5Hex(password + salt);
-            values = new Pair<>(salt, token);
-            tokens.put(hash, values);
+        builder.addQueryParameter("u", username);
+
+        if (prefs.getBoolean(Constants.PREFERENCES_KEY_AUTH_METHOD + instance, true)) {
+            int hash = (username + password).hashCode();
+            Pair<String, String> values = tokens.get(hash);
+            if (values == null) {
+                String salt = new BigInteger(130, getRandom()).toString(32);
+                String token = md5Hex(password + salt);
+                values = new Pair<>(salt, token);
+                tokens.put(hash, values);
+            }
+
+            builder.addQueryParameter("s", values.getFirst());
+            builder.addQueryParameter("t", values.getSecond());
+        } else {
+            builder.addQueryParameter("p", password);
         }
 
-        builder.addQueryParameter("u", username);
-        builder.addQueryParameter("s", values.getFirst());
-        builder.addQueryParameter("t", values.getSecond());
         builder.addQueryParameter("v", Constants.REST_PROTOCOL_VERSION_SUBSONIC);
         builder.addQueryParameter("c", Constants.REST_CLIENT_ID);
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 521e807..56845cf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -135,6 +135,8 @@
     <string name="settings.server_internal_address">Local network address</string>
     <string name="settings.server_username">Username</string>
     <string name="settings.server_password">Password</string>
+    <string name="settings.auth_method">Authentication Method</string>
+    <string name="settings.auth_summary">Use token/salt authentication?</string>
     <string name="settings.server_open_browser">Open in browser</string>
     <string name="settings.cache_title">Music cache</string>
     <string name="settings.preload_wifi">Songs to preload (Wifi)</string>