diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java
index b49aef1..2699364 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/KVVListener.java
@@ -6,13 +6,13 @@ import de.sebse.fuplanner.services.kvv.types.LoginToken;
 import de.sebse.fuplanner.tools.CustomAccountManager;
 
 public interface KVVListener {
-    void onLogin(LoginToken token);
+    default void onLogin(LoginToken token) {}
 
-    void onLogout();
+    default void onLogout() {}
 
-    void onModuleListChange();
+    default void onModuleListChange() {}
 
-    void onKVVNetworkResponse(NetworkResponse error);
+    default void onKVVNetworkResponse(NetworkResponse error) {}
 
     CustomAccountManager getAccountManager();
 }
diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java
index 6511c02..cf2d3bf 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/sync/KVVSyncAdapter.java
@@ -45,29 +45,12 @@ public class KVVSyncAdapter extends AbstractThreadedSyncAdapter {
 
     private void init(Context context) {
         mKVV = new KVV(new KVVListener() {
-            @Override
-            public void onLogin(LoginToken token) {
-
-            }
-
-            @Override
-            public void onLogout() {
-
-            }
-
-            @Override
-            public void onModuleListChange() {
-
-            }
-
-            @Override
-            public void onKVVNetworkResponse(NetworkResponse error) {
-
-            }
-
+            CustomAccountManager accountManager = null;
             @Override
             public CustomAccountManager getAccountManager() {
-                return new CustomAccountManager(AccountManager.get(context), () -> null);
+                if (accountManager == null)
+                    accountManager = new CustomAccountManager(AccountManager.get(context), () -> null);
+                return accountManager;
             }
         }, context);
         mKVV.account().restoreOnlineLogin(bool -> {});