diff --git a/app/src/com/trovebox/android/app/SettingsCommon.java b/app/src/com/trovebox/android/app/SettingsCommon.java
index bf51bf0..ca5e061 100644
--- a/app/src/com/trovebox/android/app/SettingsCommon.java
+++ b/app/src/com/trovebox/android/app/SettingsCommon.java
@@ -3,6 +3,7 @@
 
 import org.holoeverywhere.app.Activity;
 import org.holoeverywhere.app.AlertDialog;
+import org.holoeverywhere.preference.CheckBoxPreference;
 import org.holoeverywhere.preference.EditTextPreference;
 import org.holoeverywhere.preference.Preference;
 import org.holoeverywhere.preference.Preference.OnPreferenceChangeListener;
@@ -174,6 +175,10 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                         return true;
                     }
                 });
+        if (Preferences.isLimitedAccountAccessType()) {
+            autoUploadPreference.setEnabled(false);
+            ((CheckBoxPreference) autoUploadPreference).setChecked(false);
+        }
     }
 
     public PreferenceCategory getLoginCategory() {
diff --git a/app/src/com/trovebox/android/app/service/NewPhotoObserver.java b/app/src/com/trovebox/android/app/service/NewPhotoObserver.java
index 2698757..c533871 100644
--- a/app/src/com/trovebox/android/app/service/NewPhotoObserver.java
+++ b/app/src/com/trovebox/android/app/service/NewPhotoObserver.java
@@ -43,7 +43,8 @@ public void onEvent(int event, String fileName) {
             if (type != null && type.toLowerCase().startsWith("image/"))
             {
                 TrackerUtils.trackBackgroundEvent("autoupload_observer", CommonUtils.format("Processed for Mime-Type: %1$s", type));
-                if (!Preferences.isAutoUploadActive(mContext) || !CommonUtils.checkLoggedIn(true)) {
+                if (!Preferences.isAutoUploadActive(mContext) || !CommonUtils.checkLoggedIn(true)
+                        || Preferences.isLimitedAccountAccessType()) {
                     return;
                 }
                 if (checkLimits())