diff --git a/src/settings/subsonicsettingspage.cpp b/src/settings/subsonicsettingspage.cpp
index 906c57f00..77c1e336f 100644
--- a/src/settings/subsonicsettingspage.cpp
+++ b/src/settings/subsonicsettingspage.cpp
@@ -61,7 +61,7 @@ void SubsonicSettingsPage::Load() {
 
   s.beginGroup(kSettingsGroup);
   ui_->enable->setChecked(s.value("enabled", false).toBool());
-  ui_->url->setText(s.value("url").toString());
+  ui_->server_url->setText(s.value("url").toString());
   ui_->username->setText(s.value("username").toString());
   QByteArray password = s.value("password").toByteArray();
   if (password.isEmpty()) ui_->password->clear();
@@ -77,7 +77,7 @@ void SubsonicSettingsPage::Save() {
   QSettings s;
   s.beginGroup(kSettingsGroup);
   s.setValue("enabled", ui_->enable->isChecked());
-  s.setValue("url", QUrl(ui_->url->text()));
+  s.setValue("url", QUrl(ui_->server_url->text()));
   s.setValue("username", ui_->username->text());
   s.setValue("password", QString::fromUtf8(ui_->password->text().toUtf8().toBase64()));
   s.setValue("verifycertificate", ui_->checkbox_verify_certificate->isChecked());
@@ -90,18 +90,18 @@ void SubsonicSettingsPage::Save() {
 
 void SubsonicSettingsPage::TestClicked() {
 
-  if (ui_->url->text().isEmpty() || ui_->username->text().isEmpty() || ui_->password->text().isEmpty()) {
-    QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing url, username or password."));
+  if (ui_->server_url->text().isEmpty() || ui_->username->text().isEmpty() || ui_->password->text().isEmpty()) {
+    QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing server url, username or password."));
     return;
   }
 
-  QUrl url(ui_->url->text());
-  if (!url.isValid()) {
-    QMessageBox::critical(this, tr("Configuration incorrect"), tr("URL is invalid."));
+  QUrl server_url(ui_->server_url->text());
+  if (!server_url.isValid() || server_url.scheme().isEmpty() || server_url.host().isEmpty()) {
+    QMessageBox::critical(this, tr("Configuration incorrect"), tr("Server URL is invalid."));
     return;
   }
 
-  emit Test(url, ui_->username->text(), ui_->password->text());
+  emit Test(server_url, ui_->username->text(), ui_->password->text());
   ui_->button_test->setEnabled(false);
 
 }
diff --git a/src/settings/subsonicsettingspage.ui b/src/settings/subsonicsettingspage.ui
index 9e47f3253..c4dfa6201 100644
--- a/src/settings/subsonicsettingspage.ui
+++ b/src/settings/subsonicsettingspage.ui
@@ -37,7 +37,7 @@
       <item>
        <layout class="QHBoxLayout" name="layout_server">
         <item>
-         <widget class="QLineEdit" name="url"/>
+         <widget class="QLineEdit" name="server_url"/>
         </item>
         <item>
          <spacer name="spacer_server">
@@ -119,21 +119,22 @@
      <property name="title">
       <string>Preferences</string>
      </property>
-     <layout class="QFormLayout" name="layout_preferences"/>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="checkbox_verify_certificate">
-     <property name="text">
-      <string>Verify server certificate</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="checkbox_cache_album_covers">
-     <property name="text">
-      <string>Cache album covers</string>
-     </property>
+     <layout class="QFormLayout" name="layout_preferences">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="checkbox_verify_certificate">
+        <property name="text">
+         <string>Verify server certificate</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="checkbox_cache_album_covers">
+        <property name="text">
+         <string>Cache album covers</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>