diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
index 0660c9043..c7565b215 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
@@ -27,6 +27,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.io.IOException;
 import java.util.Locale;
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
index f9f289d33..247c9e422 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
@@ -18,6 +18,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.FloatingActionButton;
@@ -94,6 +95,7 @@ public class ShareActivity
     ModifierSequenceDao modifierSequenceDao;
     @Inject
     CategoryApi apiCall;
+    @Inject @Named("application_preferences") SharedPreferences applicationPrefs;
     @Inject
     @Named("default_preferences")
     SharedPreferences prefs;
@@ -167,6 +169,7 @@ public class ShareActivity
         else  //Send user to login activity
         {
             Toast.makeText(this, "You need to login first!", Toast.LENGTH_SHORT).show();
+            applicationPrefs.edit().putBoolean("login_skipped", false).apply();
             Intent loginIntent = new Intent(ShareActivity.this, LoginActivity.class);
             startActivity(loginIntent);
         }