diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java
index d4218916a..09170fd60 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java
@@ -58,7 +58,8 @@ class LoginTask extends AsyncTask<String, String, String> {
     protected void onPostExecute(String result) {
         super.onPostExecute(result);
         Timber.d("Login done!");
-        loginActivity.getSharedPreferences("fr.free.nrw.commons", LoginActivity.MODE_PRIVATE).edit().putString("username", username).apply();
+        loginActivity.getSharedPreferences("prefs", LoginActivity.MODE_PRIVATE).edit()
+                .putString("username", username).apply();
         EventLog.schema(CommonsApplication.EVENT_LOGIN_ATTEMPT)
                 .param("username", username)
                 .param("result", result)
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 07e12ace4..bcc29d51f 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -43,7 +43,8 @@ public class NavigationBaseActivity extends BaseActivity
 
     public void initDrawer() {
         navigationView.setNavigationItemSelectedListener(this);
-        ((TextView) navigationView.getHeaderView(0).findViewById(R.id.userNameText)).setText(getSharedPreferences("fr.free.nrw.commons", MODE_PRIVATE).getString("username", ""));
+        ((TextView) navigationView.getHeaderView(0).findViewById(R.id.userNameText))
+                .setText(getSharedPreferences("prefs", MODE_PRIVATE).getString("username", ""));
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         toggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar,
@@ -126,7 +127,8 @@ public class NavigationBaseActivity extends BaseActivity
                         .setPositiveButton(R.string.yes, (dialog, which) -> {
                             ((CommonsApplication) getApplicationContext())
                                     .clearApplicationData(NavigationBaseActivity.this);
-                            getSharedPreferences("fr.free.nrw.commons", MODE_PRIVATE).edit().remove("username").apply();
+                            getSharedPreferences("prefs", MODE_PRIVATE)
+                                    .edit().remove("username").apply();
                             Intent nearbyIntent = new Intent(
                                     NavigationBaseActivity.this, LoginActivity.class);
                             nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);