diff --git a/src/org/minima/system/commands/maxima/maxima.java b/src/org/minima/system/commands/maxima/maxima.java
index 63c44b1b2..941f73a29 100644
--- a/src/org/minima/system/commands/maxima/maxima.java
+++ b/src/org/minima/system/commands/maxima/maxima.java
@@ -467,7 +467,7 @@ public static Message createSendMessage(String zFullTo, String zApplication, Min
 		//Send a message..
 		String fullto 	= zFullTo;
 		int indexp 		= fullto.indexOf("@");
-		int index 		= fullto.indexOf(":");
+		int index 		= fullto.lastIndexOf(":");
 		
 		//Get the Public Key
 		String publickey = fullto.substring(0,indexp);
diff --git a/src/org/minima/system/commands/network/connect.java b/src/org/minima/system/commands/network/connect.java
index 3dc04ccc2..5282e8dfb 100644
--- a/src/org/minima/system/commands/network/connect.java
+++ b/src/org/minima/system/commands/network/connect.java
@@ -63,7 +63,7 @@ public JSONObject runCommand() throws Exception {
 
 	public static Message createConnectMessage(String zFullHost) {
 		//IP and PORT
-		int index = zFullHost.indexOf(":");
+		int index = zFullHost.lastIndexOf(":");
 		if(index == -1) {
 			return null;
 		}