diff --git a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java b/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
index 9d0647cc06a17e1ef8048c75ed7edb0af646f50f..c59be431d77b9f6768b5a6fee365e4d1e16f836a 100644
--- a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
+++ b/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java
@@ -5,7 +5,6 @@ import static android.text.InputType.TYPE_CLASS_NUMBER;
 import static android.view.Gravity.CENTER;
 import static android.view.Gravity.CENTER_HORIZONTAL;
 import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
-import static net.sf.briar.api.plugins.InvitationConstants.MAX_CODE;
 import net.sf.briar.R;
 import android.content.Context;
 import android.view.KeyEvent;
@@ -83,7 +82,6 @@ OnEditorActionListener, OnClickListener {
 		} catch(NumberFormatException e) {
 			return false;
 		}
-		if(remoteCode < 0 || remoteCode > MAX_CODE) return false;
 		// Hide the soft keyboard
 		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
 	    ((InputMethodManager) o).toggleSoftInput(HIDE_IMPLICIT_ONLY, 0);
diff --git a/briar-api/src/net/sf/briar/api/plugins/InvitationConstants.java b/briar-api/src/net/sf/briar/api/plugins/InvitationConstants.java
index bc4e2a7845e08b1bf375ba45dca16fd6247b5cbf..57c5a6beb6405ca3430fe09ea834fa6d6ac1e1ca 100644
--- a/briar-api/src/net/sf/briar/api/plugins/InvitationConstants.java
+++ b/briar-api/src/net/sf/briar/api/plugins/InvitationConstants.java
@@ -2,14 +2,12 @@ package net.sf.briar.api.plugins;
 
 public interface InvitationConstants {
 
-	long CONNECTION_TIMEOUT = 15 * 1000; // Milliseconds
+	long CONNECTION_TIMEOUT = 30 * 1000; // Milliseconds
 
 	long CONFIRMATION_TIMEOUT = 60 * 1000; // Milliseconds
 
 	int CODE_BITS = 19; // Codes must fit into six decimal digits
 
-	int MAX_CODE = (1 << CODE_BITS) - 1; // 524287
-
 	int HASH_LENGTH = 48; // Bytes
 
 	int MAX_PUBLIC_KEY_LENGTH = 97; // Bytes