diff --git a/core/res/values/strings.xml b/core/res/values/strings.xml
index b37aedad..e3c335c3 100644
--- a/core/res/values/strings.xml
+++ b/core/res/values/strings.xml
@@ -278,10 +278,10 @@
         <item>Buffalo NAS -1.31</item>
         <item>Deluge 1.2+</item>
         <item>DLink Router BT</item>
-        <item>Dummy</item>
         <item>Ktorrent</item>
         <item>qBittorrent</item>
         <item>rTorrent</item>
+        <item>Synology</item>
         <item>Torrentflux-b4rt</item>
         <item>Transmission</item>
         <item>µTorrent</item>
@@ -294,10 +294,10 @@
         <item>daemon_buffalonas</item>
         <item>daemon_deluge</item>
         <item>daemon_dlinkrouterbt</item>
-        <item>daemon_dummy</item>
         <item>daemon_ktorrent</item>
         <item>daemon_qbittorrent</item>
         <item>daemon_rtorrent</item>
+        <item>daemon_synology</item>
         <item>daemon_tfb4rt</item>
         <item>daemon_transmission</item>
         <item>daemon_utorrent</item>
diff --git a/core/res/xml/pref_server.xml b/core/res/xml/pref_server.xml
index b5693ee6..d13f3399 100644
--- a/core/res/xml/pref_server.xml
+++ b/core/res/xml/pref_server.xml
@@ -57,7 +57,8 @@
 		<EditTextPreference
 			android:key="server_localnetwork"
 			android:title="@string/pref_localnetwork"
-			android:summary="@string/pref_localnetwork_info" />
+			android:summary="@string/pref_localnetwork_info"
+			android:inputType="textNoSuggestions" />
 		<EditTextPreference
 			android:key="server_folder"
 			android:title="@string/pref_folder"
diff --git a/core/src/org/transdroid/core/app/settings/ServerSetting.java b/core/src/org/transdroid/core/app/settings/ServerSetting.java
index 98261820..556440e6 100644
--- a/core/src/org/transdroid/core/app/settings/ServerSetting.java
+++ b/core/src/org/transdroid/core/app/settings/ServerSetting.java
@@ -112,7 +112,7 @@ public class ServerSetting implements SimpleListItem {
 			return name;
 		if (!TextUtils.isEmpty(address)) {
 			String host = Uri.parse(address).getHost();
-			return host == null? DEFAULT_NAME: host;
+			return host == null ? DEFAULT_NAME : host;
 		}
 		return DEFAULT_NAME;
 	}
@@ -250,20 +250,28 @@ public class ServerSetting implements SimpleListItem {
 
 	/**
 	 * Returns the appropriate daemon adapter to which tasks can be executed, in accordance with this server's settings
-	 * @return An IDaemonAdapter instance of the specific torrent client daemon type 
+	 * @param connectedToNetwork The name of the (wifi) network we are currently connected to, or null if this could not
+	 *            be determined
+	 * @return An IDaemonAdapter instance of the specific torrent client daemon type
 	 */
-	public IDaemonAdapter createServerAdapter() {
-		return type.createAdapter(convertToDaemonSettings());
+	public IDaemonAdapter createServerAdapter(String connectedToNetwork) {
+		return type.createAdapter(convertToDaemonSettings(connectedToNetwork));
 	}
 
-	private DaemonSettings convertToDaemonSettings() {
-		// Convert local server settings into an old-style DaemonSetting object
-		// The local integer key is converted to the idString string
-		// TODO: Add localaddress and localnetwork to DaemonSettings, or solve properly rework the Connect library
-		// handling of settings
-		return new DaemonSettings(name, type, address, port, ssl, sslTrustAll, sslTrustKey,
-				folder, useAuthentication, username, password, extraPass, os, downloadDir, ftpUrl, ftpPassword,
-				timeout, alarmOnFinishedDownload, alarmOnNewTorrent, Integer.toString(key), isAutoGenerated);
+	/**
+	 * Converts local server settings into an old-style {@link DaemonSettings} object.
+	 * @param connectedToNetwork The name of the (wifi) network we are currently connected to, or null if this could not
+	 *            be determined
+	 * @return A {@link DaemonSettings} object to execute server commands against
+	 */
+	private DaemonSettings convertToDaemonSettings(String connectedToNetwork) {
+		// The local integer key is converted to the idString string.
+		// The host name address used is dependent on the network that we are currently connected to (to allow a
+		// distinct connection IP or host name when connected to a local network).
+		return new DaemonSettings(name, type,
+				connectedToNetwork != null && connectedToNetwork.equals(localNetwork) ? localAddress : address, port,
+				ssl, sslTrustAll, sslTrustKey, folder, useAuthentication, username, password, extraPass, os,
+				downloadDir, ftpUrl, ftpPassword, timeout, alarmOnFinishedDownload, alarmOnNewTorrent,
+				Integer.toString(key), isAutoGenerated);
 	}
-
 }
diff --git a/core/src/org/transdroid/core/gui/DetailsActivity.java b/core/src/org/transdroid/core/gui/DetailsActivity.java
index 8261eb49..c34b0149 100644
--- a/core/src/org/transdroid/core/gui/DetailsActivity.java
+++ b/core/src/org/transdroid/core/gui/DetailsActivity.java
@@ -35,6 +35,7 @@ import org.transdroid.core.gui.lists.LocalTorrent;
 import org.transdroid.core.gui.log.Log;
 import org.transdroid.core.gui.navigation.Label;
 import org.transdroid.core.gui.navigation.NavigationHelper;
+import org.transdroid.core.service.ConnectivityHelper;
 import org.transdroid.daemon.Daemon;
 import org.transdroid.daemon.IDaemonAdapter;
 import org.transdroid.daemon.Priority;
@@ -91,6 +92,8 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 	@Bean
 	protected NavigationHelper navigationHelper;
 	@Bean
+	protected ConnectivityHelper connectivityHelper;
+	@Bean
 	protected ApplicationSettings applicationSettings;
 	private IDaemonAdapter currentConnection = null;
 
@@ -123,7 +126,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 
 		// Connect to the last used server
 		ServerSetting lastUsed = applicationSettings.getLastUsedServer();
-		currentConnection = lastUsed.createServerAdapter();
+		currentConnection = lastUsed.createServerAdapter(connectivityHelper.getConnectedNetworkName());
 
 		// Show details and load fine stats and torrent files
 		fragmentDetails.updateTorrent(torrent);
diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java
index 88d79ea0..7d010b27 100644
--- a/core/src/org/transdroid/core/gui/TorrentsActivity.java
+++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java
@@ -55,6 +55,7 @@ import org.transdroid.core.gui.search.FilePickerHelper;
 import org.transdroid.core.gui.search.UrlEntryDialog;
 import org.transdroid.core.gui.settings.*;
 import org.transdroid.core.service.BootReceiver;
+import org.transdroid.core.service.ConnectivityHelper;
 import org.transdroid.daemon.Daemon;
 import org.transdroid.daemon.IDaemonAdapter;
 import org.transdroid.daemon.Priority;
@@ -125,6 +126,8 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 	// Navigation components
 	@Bean
 	protected NavigationHelper navigationHelper;
+	@Bean
+	protected ConnectivityHelper connectivityHelper;
 	@ViewById
 	protected SherlockListView filtersList;
 	protected FilterListAdapter navigationListAdapter = null;
@@ -219,7 +222,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 
 		// Handle any start up intents
 		if (firstStart && getIntent() != null) {
-			currentConnection = lastUsed.createServerAdapter();
+			currentConnection = lastUsed.createServerAdapter(connectivityHelper.getConnectedNetworkName());
 			handleStartIntent();
 		}
 		
@@ -356,7 +359,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 			}
 
 			// Update connection to the newly selected server and refresh
-			currentConnection = server.createServerAdapter();
+			currentConnection = server.createServerAdapter(connectivityHelper.getConnectedNetworkName());
 			applicationSettings.setLastUsedServer(server);
 			navigationSpinnerAdapter.updateCurrentServer(currentConnection);
 			if (forceNewConnection)
diff --git a/core/src/org/transdroid/core/service/AppUpdateService.java b/core/src/org/transdroid/core/service/AppUpdateService.java
index 0f6d4dfa..4296e450 100644
--- a/core/src/org/transdroid/core/service/AppUpdateService.java
+++ b/core/src/org/transdroid/core/service/AppUpdateService.java
@@ -68,7 +68,7 @@ public class AppUpdateService extends IntentService {
 	@Override
 	protected void onHandleIntent(Intent intent) {
 
-		if (!connectivityHelper.shouldPerformActions() || !systemSettings.checkForUpdates()) {
+		if (!connectivityHelper.shouldPerformBackgroundActions() || !systemSettings.checkForUpdates()) {
 			Log.d(this,
 					"Skip the app update service, as background data is disabled, the service is disabled or we are not connected.");
 			return;
diff --git a/core/src/org/transdroid/core/service/ConnectivityHelper.java b/core/src/org/transdroid/core/service/ConnectivityHelper.java
index 26e637a7..be7d1775 100644
--- a/core/src/org/transdroid/core/service/ConnectivityHelper.java
+++ b/core/src/org/transdroid/core/service/ConnectivityHelper.java
@@ -22,18 +22,21 @@ import org.androidannotations.annotations.EBean.Scope;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
 
 @EBean(scope = Scope.Singleton)
 public class ConnectivityHelper {
 
 	@SystemService
 	protected ConnectivityManager connectivityManager;
+	@SystemService
+	protected WifiManager wifiManager;
 
 	public ConnectivityHelper(Context context) {
 	}
 
 	@SuppressWarnings("deprecation")
-	public boolean shouldPerformActions() {
+	public boolean shouldPerformBackgroundActions() {
 		// First check the old background data setting (this will always be true for ICS+)
 		if (!connectivityManager.getBackgroundDataSetting())
 			return false;
@@ -42,4 +45,10 @@ public class ConnectivityHelper {
 		return connectivityManager.getActiveNetworkInfo().isConnected();
 	}
 
+	public String getConnectedNetworkName() {
+		if (wifiManager.getConnectionInfo() != null) {
+			return wifiManager.getConnectionInfo().getSSID().replace("\"", "");
+		}
+		return null;
+	}
 }
diff --git a/core/src/org/transdroid/core/service/RssCheckerService.java b/core/src/org/transdroid/core/service/RssCheckerService.java
index a9d0a0f1..f3098246 100644
--- a/core/src/org/transdroid/core/service/RssCheckerService.java
+++ b/core/src/org/transdroid/core/service/RssCheckerService.java
@@ -62,7 +62,7 @@ public class RssCheckerService extends IntentService {
 	@Override
 	protected void onHandleIntent(Intent intent) {
 
-		if (!connectivityHelper.shouldPerformActions() || !notificationSettings.isEnabled()) {
+		if (!connectivityHelper.shouldPerformBackgroundActions() || !notificationSettings.isEnabled()) {
 			Log.d(this,
 					"Skip the RSS checker service, as background data is disabled, the service is disabled or we are not connected.");
 			return;
diff --git a/core/src/org/transdroid/core/service/ServerCheckerService.java b/core/src/org/transdroid/core/service/ServerCheckerService.java
index e61021bb..9de64625 100644
--- a/core/src/org/transdroid/core/service/ServerCheckerService.java
+++ b/core/src/org/transdroid/core/service/ServerCheckerService.java
@@ -69,7 +69,7 @@ public class ServerCheckerService extends IntentService {
 	@Override
 	protected void onHandleIntent(Intent intent) {
 
-		if (!connectivityHelper.shouldPerformActions() || !notificationSettings.isEnabled()) {
+		if (!connectivityHelper.shouldPerformBackgroundActions() || !notificationSettings.isEnabled()) {
 			Log.d(this,
 					"Skip the server checker service, as background data is disabled, the service is disabled or we are not connected.");
 			return;
@@ -88,7 +88,7 @@ public class ServerCheckerService extends IntentService {
 			JSONArray lastStats = applicationSettings.getServerLastStats(server);
 
 			// Synchronously retrieve torrents listing
-			IDaemonAdapter adapter = server.createServerAdapter();
+			IDaemonAdapter adapter = server.createServerAdapter(connectivityHelper.getConnectedNetworkName());
 			DaemonTaskResult result = RetrieveTask.create(adapter).execute();
 			if (!(result instanceof RetrieveTaskSuccessResult)) {
 				// Cannot retrieve torrents at this time
diff --git a/full/AndroidManifest.xml b/full/AndroidManifest.xml
index 2508b9e9..61202835 100644
--- a/full/AndroidManifest.xml
+++ b/full/AndroidManifest.xml
@@ -33,6 +33,7 @@
 
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/lib/src/org/transdroid/daemon/Daemon.java b/lib/src/org/transdroid/daemon/Daemon.java
index 847175f2..8eeb2e25 100644
--- a/lib/src/org/transdroid/daemon/Daemon.java
+++ b/lib/src/org/transdroid/daemon/Daemon.java
@@ -145,6 +145,8 @@ public enum Daemon {
 			return "daemon_qbittorrent";
 		case rTorrent:
 			return "daemon_rtorrent";
+		case Synology:
+			return "daemon_synology";
 		case Tfb4rt:
 			return "daemon_tfb4rt";
 		case Transmission:
@@ -197,15 +199,15 @@ public enum Daemon {
 		if (daemonCode.equals("daemon_rtorrent")) {
 			return rTorrent;
 		}
+		if (daemonCode.equals("daemon_synology")) {
+			return Synology;
+		}
 		if (daemonCode.equals("daemon_tfb4rt")) {
 			return Tfb4rt;
 		}
         if (daemonCode.equals("daemon_transmission")) {
             return Transmission;
         }
-		if (daemonCode.equals("daemon_synology")) {
-			return Synology;
-		}
 		if (daemonCode.equals("daemon_utorrent")) {
 			return uTorrent;
 		}
diff --git a/lite/AndroidManifest.xml b/lite/AndroidManifest.xml
index be11360b..327a5fef 100644
--- a/lite/AndroidManifest.xml
+++ b/lite/AndroidManifest.xml
@@ -33,6 +33,7 @@
 
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />