diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7aac894420445e73d0f0c60d32a616e7db3d0ff8..9a3ce1ae3d6e36b641828cb0ec45a4229c76494d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,8 +42,8 @@ build-prod:
         exit 1
       fi
       cd "release"
-      unsigned_build=$(ls *.apk | grep "unsigned")
-      cp $unsigned_build $UNSIGNED_APK
+      unsigned_build=$(ls *.apk | grep "release")
+      mv $unsigned_build $UNSIGNED_APK
   artifacts:
     paths:
       - app/build/outputs/apk/ose/
@@ -61,8 +61,8 @@ build-staging:
         exit 1
       fi
       cd "release"
-      unsigned_build=$(ls *.apk | grep "unsigned")
-      cp $unsigned_build $UNSIGNED_APK
+      unsigned_build=$(ls *.apk | grep "release")
+      mv $unsigned_build $UNSIGNED_APK
   artifacts:
     paths:
       - app/build/outputs/apk/ose/
diff --git a/app/build.gradle b/app/build.gradle
index b5d48cd24e4682f8a98f65e7015d2090e01bc112..7650c25ba5ef32b0d174e5b2c5a4ac3bf5a4af46 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -118,6 +118,7 @@ android {
         }
 
         release {
+            signingConfig = signingConfigs.debug
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-release.pro'
 
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
index bf7029483f906e51db3b782441163f84aecdb0a3..d3a08789089e725570156e5dea4bf61b0dd5bd25 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
@@ -374,6 +374,10 @@ class AccountDetailsFragment : Fragment() {
                     accountType in AccountUtils.getOpenIdMainAccountTypes(context) &&
                             credentials?.authState != null
 
+                val isExisitingAccount = accountManager.getAccountsByType(account.type)
+                    .any { it.name == credentials?.userName }
+                val isReauthAccount = basicAuthAccount != null || (isAccountUsingOAuth && isExisitingAccount)
+
                 if (basicAuthAccount != null) {
                     val authState = credentials?.authState
                     if (authState != null) {
@@ -446,7 +450,7 @@ class AccountDetailsFragment : Fragment() {
                 var calendarSyncEnabled = true
                 var tasksSyncEnabled = true
 
-                if (basicAuthAccount != null || isAccountUsingOAuth) {
+                if (isReauthAccount) {
                     val accountToUpdate = basicAuthAccount ?: account
                     val oldSettings = AccountSettings(context, accountToUpdate)
                     val addressBookAuthority = context.getString(R.string.address_books_authority)
@@ -554,7 +558,7 @@ class AccountDetailsFragment : Fragment() {
                     // Configure CardDAV service
                     val addressBookAuthority = context.getString(R.string.address_books_authority)
                     if (config.cardDAV != null) {
-                        if (basicAuthAccount != null || isAccountUsingOAuth) {
+                        if (isReauthAccount) {
                             val accountToUpdate = basicAuthAccount ?: account
                             // Update existing service
                             val service = db.serviceDao().getByAccountAndType(accountToUpdate.name, Service.TYPE_CARDDAV)
@@ -593,7 +597,7 @@ class AccountDetailsFragment : Fragment() {
 
                     // Configure CalDAV service
                     if (config.calDAV != null) {
-                        if (basicAuthAccount != null || isAccountUsingOAuth) {
+                        if (isReauthAccount) {
                             val accountToUpdate = basicAuthAccount ?: account
                             // Update existing service
                             val service = db.serviceDao().getByAccountAndType(accountToUpdate.name, Service.TYPE_CALDAV)