diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/async/AccountAction.java b/app/src/main/java/org/nuclearfog/twidda/backend/async/AccountAction.java
index 1c189091..b6718d58 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/async/AccountAction.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/async/AccountAction.java
@@ -40,6 +40,7 @@ public class AccountAction extends AsyncExecutor<AccountAction.Param, AccountAct
 				} else {
 					settings.setPushEnabled(false);
 				}
+				database.resetDatabase();
 				return new Result(Result.SELECT, param.account);
 
 			case Param.REMOVE:
diff --git a/app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java b/app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java
index ef38f63d..310498ca 100644
--- a/app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java
+++ b/app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java
@@ -1102,21 +1102,42 @@ public class AppDatabase {
 	}
 
 	/**
-	 * remove database tables except account table
+	 * reset database tables
+	 * re-create database tables and keep all login and web push subscriptions
 	 */
 	public void resetDatabase() {
 		synchronized (adapter) {
 			// save logins first
 			List<Account> logins = getLogins();
+			List<WebPush> webPushs = getWebPushs();
 			// reset database
 			adapter.resetDatabase();
 			// restore saved logins
 			for (Account login : logins) {
 				saveLogin(login);
 			}
+			// restore web push subscription
+			for (WebPush webPush : webPushs) {
+				savePushSubscription(webPush);
+			}
 		}
 	}
 
+	/**
+	 * get all web push subscriptions
+	 */
+	private List<WebPush> getWebPushs() {
+		List<WebPush> result = new LinkedList<>();
+
+		SQLiteDatabase db = adapter.getDbRead();
+		Cursor c = db.query(PushTable.TABLE, DatabasePush.COLUMNS, null, null, null, null, null);
+		if (c.moveToFirst()) {
+			result.add(new DatabasePush(c));
+		}
+		c.close();
+		return result;
+	}
+
 	/**
 	 * get status information from database
 	 *