diff --git a/core/src/org/transdroid/core/app/settings/ApplicationSettings.java b/core/src/org/transdroid/core/app/settings/ApplicationSettings.java
index 5946714e..3fc0eeec 100644
--- a/core/src/org/transdroid/core/app/settings/ApplicationSettings.java
+++ b/core/src/org/transdroid/core/app/settings/ApplicationSettings.java
@@ -89,13 +89,17 @@ public class ApplicationSettings {
 		// @formatter:off
 		Daemon type = Daemon.fromCode(prefs.getString("server_type_" + order, null));
 		boolean ssl = prefs.getBoolean("server_sslenabled_" + order, false);
-		String defaultPort = Integer.toString(Daemon.getDefaultPortNumber(type, ssl));
+		
+		String port = prefs.getString("server_port_" + order, "");
+		if(port.equals(""))
+			port = Integer.toString(Daemon.getDefaultPortNumber(type, ssl));
+		
 		return new ServerSetting(order, 
 				prefs.getString("server_name_" + order, null), type, 
 				prefs.getString("server_address_" + order, null), 
 				prefs.getString("server_localaddress_" + order, null),
 				prefs.getString("server_localnetwork_" + order, null), 
-				Integer.parseInt(prefs.getString("server_port_" + order, defaultPort)), 
+				Integer.parseInt(port), 
 				ssl, 
 				prefs.getBoolean("server_ssltrustall_" + order, false),
 				prefs.getString("server_ssltrustkey_" + order, null), 
diff --git a/lib/src/org/transdroid/daemon/Torrent.java b/lib/src/org/transdroid/daemon/Torrent.java
index 75bfb86c..e05cb1f6 100644
--- a/lib/src/org/transdroid/daemon/Torrent.java
+++ b/lib/src/org/transdroid/daemon/Torrent.java
@@ -142,7 +142,12 @@ public final class Torrent implements Parcelable, Comparable<Torrent> {
 		if (realDateDone != null) {
 			this.dateDone = realDateDone;
 		} else {
-			if (eta == -1 || eta == -2) {
+			if( this.partDone == 1){ //finished but no finished date set so move to bottom of list
+				Calendar cal = Calendar.getInstance();
+				cal.clear();
+				cal.set(1900, 12, 31);
+				this.dateDone = cal.getTime();
+			} else if (eta == -1 || eta == -2) {
 				this.dateDone = new Date(Long.MAX_VALUE);
 			} else {
 				Calendar cal = Calendar.getInstance();