diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/LoginActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/LoginActivity.java
index 6e5c5e9f2aa338825e3fc61d80018559fff77d1f..36ad8cf3fb2aa0c0de56e218caf1ade103458a36 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/LoginActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/LoginActivity.java
@@ -26,6 +26,9 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 
+import com.raizlabs.android.dbflow.config.FlowManager;
+
+import de.kuschku.libquassel.localtypes.orm.ConnectedDatabase;
 import de.kuschku.quasseldroid_ng.ui.chat.MainActivity;
 import de.kuschku.quasseldroid_ng.ui.chat.util.ServiceHelper;
 import de.kuschku.quasseldroid_ng.ui.setup.AccountSelectActivity;
@@ -55,6 +58,10 @@ public class LoginActivity extends AppCompatActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (resultCode == RESULT_OK) {
+            // If we select a different core than we used last time, clear the database
+            if (!context.settings().preferenceLastAccount.get().equals(data.getBundleExtra("extra").getString("account")))
+                deleteDatabase(ConnectedDatabase.NAME);
+
             context.settings().preferenceLastAccount.set(data.getBundleExtra("extra").getString("account"));
             checkReady();
             firstStart = true;
diff --git a/build.gradle b/build.gradle
index 45ba4278665a8dd840296abbc4b86c100aadfe3b..3792c8a3bcec18f004a161dda9c20d3861eff254 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-alpha7'
+        classpath 'com.android.tools.build:gradle:2.1.2'
         classpath 'me.tatarka:gradle-retrolambda:3.2.4'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }