diff --git a/build.gradle b/build.gradle
index befe8b1c734220b48c84687af613e3e0de5a99c3..7fcf8927a5eebfeb605a949bf4bda2e03128c1e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,7 +104,7 @@ android {
 
         quicksy {
             dimension "mode"
-            applicationId = "im.conversations.quick"
+            applicationId = "im.quicksy.client"
             resValue "string", "app_name", "Quicksy"
             resValue "string", "applicationId", applicationId
             buildConfigField "String", "LOGTAG", "\"quicksy\""
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index d43622f0ec663ed96ec0ea6cba8661395f4a4696..f28ab354b035a559a728e3098f20cb0005afc7eb 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -41,7 +41,7 @@ public final class Config {
 
 	public static final String DOMAIN_LOCK = null; //only allow account creation for this domain
 	public static final String MAGIC_CREATE_DOMAIN = "conversations.im";
-	public static final String QUICKSY_DOMAIN = "venus.fritz.box";
+	public static final String QUICKSY_DOMAIN = "quicksy.im";
 	public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox
 
 	public static final boolean USE_RANDOM_RESOURCE_ON_EVERY_BIND = false;
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index bd43daf8386eded98bf641fc7fac812b66f5ca91..74f597d708b13fb652fe9681a6d6036d358260e6 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -775,6 +775,7 @@
     <string name="verifying">Verifying…</string>
     <string name="requesting_sms">Requesting SMS…</string>
     <string name="incorrect_pin">The pin you have entered is incorrect.</string>
+    <string name="pin_expired">The pin we have sent you has expired.</string>
     <string name="unknown_api_error_network">Unknown network error.</string>
     <string name="unknown_api_error_response">Unknown response from server.</string>
     <string name="unable_to_connect_to_server">Unable to connect to server.</string>
diff --git a/src/quicksy/java/eu/siacs/conversations/services/QuickConversationsService.java b/src/quicksy/java/eu/siacs/conversations/services/QuickConversationsService.java
index e34099f9272e9ef77ef1fd38fc7148ca5eaab7d6..4cf56dcb3e6affc1fc3e149bb7201d43844084bc 100644
--- a/src/quicksy/java/eu/siacs/conversations/services/QuickConversationsService.java
+++ b/src/quicksy/java/eu/siacs/conversations/services/QuickConversationsService.java
@@ -55,7 +55,7 @@ public class QuickConversationsService extends AbstractQuickConversationsService
     public static final int API_ERROR_SSL_HANDSHAKE = -4;
     public static final int API_ERROR_AIRPLANE_MODE = -5;
 
-    private static final String BASE_URL = "http://venus.fritz.box:4567";
+    private static final String BASE_URL = "https://api.quicksy.im";
 
     private static final String INSTALLATION_ID = "eu.siacs.conversations.installation-id";
 
diff --git a/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java b/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java
index b345744925b1eaf9b3a79d531ace07ce0d1c058c..80ef88335b08bdb549baf24ed55f6f5fb37ddb30 100644
--- a/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java
+++ b/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java
@@ -280,9 +280,9 @@ public class VerifyActivity extends XmppActivity implements ClipboardManager.OnP
     public void onVerificationFailed(final int code) {
         runOnUiThread(() -> {
             setVerifyingState(false);
-            if (code == 401) {
+            if (code == 401 || code == 404) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setMessage(R.string.incorrect_pin);
+                builder.setMessage(code == 404 ? R.string.pin_expired : R.string.incorrect_pin);
                 builder.setPositiveButton(R.string.ok, null);
                 builder.create().show();
             } else {