diff --git a/src/app/components/avatar.component.ts b/src/app/components/avatar.component.ts
index 429723bdcc..1108247820 100644
--- a/src/app/components/avatar.component.ts
+++ b/src/app/components/avatar.component.ts
@@ -45,8 +45,8 @@ export class AvatarComponent implements OnChanges, OnInit {
     }
 
     private async generate() {
-        const useGravatars = await this.stateService.get<boolean>('useGravatars');
-        if (useGravatars && this.email != null) {
+        const enableGravatars = await this.stateService.get<boolean>('enableGravatars');
+        if (enableGravatars && this.email != null) {
             const hashBytes = await this.cryptoFunctionService.hash(this.email.toLowerCase().trim(), 'md5');
             const hash = Utils.fromBufferToHex(hashBytes).toLowerCase();
             this.src = 'https://www.gravatar.com/avatar/' + hash + '?s=' + this.size + '&r=pg&d=retro';
diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
index fc6e77a140..448efa99e6 100644
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -146,7 +146,7 @@ export function initFactory(): Function {
         htmlEl.classList.add('theme_' + theme);
         stateService.save(ConstantsService.disableFaviconKey,
             await storageService.get<boolean>(ConstantsService.disableFaviconKey));
-        stateService.save('useGravatars', await storageService.get<boolean>('useGravatars'));
+        stateService.save('enableGravatars', await storageService.get<boolean>('enableGravatars'));
     };
 }
 
diff --git a/src/app/settings/options.component.html b/src/app/settings/options.component.html
index 049eaa9edb..c9ac1f2506 100644
--- a/src/app/settings/options.component.html
+++ b/src/app/settings/options.component.html
@@ -44,15 +44,15 @@
     </div>
     <div class="form-group">
         <div class="form-check">
-            <input class="form-check-input" type="checkbox" id="useGravatars" name="UseGravatars" [(ngModel)]="useGravatars">
-            <label class="form-check-label" for="useGravatars">
-                {{'useGravatars' | i18n}}
+            <input class="form-check-input" type="checkbox" id="enableGravatars" name="enableGravatars" [(ngModel)]="enableGravatars">
+            <label class="form-check-label" for="enableGravatars">
+                {{'enableGravatars' | i18n}}
             </label>
             <a href="https://gravatar.com/" target="_blank" rel="noopener" title="{{'learnMore' | i18n}}">
                 <i class="fa fa-question-circle-o"></i>
             </a>
         </div>
-        <small class="form-text text-muted">{{'useGravatarsDesc' | i18n}}</small>
+        <small class="form-text text-muted">{{'enableGravatarsDesc' | i18n}}</small>
     </div>
     <button type="submit" class="btn btn-primary">
         {{'save' | i18n}}
diff --git a/src/app/settings/options.component.ts b/src/app/settings/options.component.ts
index c3553084e2..7bc0296f42 100644
--- a/src/app/settings/options.component.ts
+++ b/src/app/settings/options.component.ts
@@ -23,7 +23,7 @@ import { Utils } from 'jslib/misc/utils';
 export class OptionsComponent implements OnInit {
     lockOption: number = null;
     disableIcons: boolean;
-    useGravatars: boolean;
+    enableGravatars: boolean;
     locale: string;
     lockOptions: any[];
     localeOptions: any[];
@@ -59,7 +59,7 @@ export class OptionsComponent implements OnInit {
     async ngOnInit() {
         this.lockOption = await this.storageService.get<number>(ConstantsService.lockOptionKey);
         this.disableIcons = await this.storageService.get<boolean>(ConstantsService.disableFaviconKey);
-        this.useGravatars = await this.storageService.get<boolean>('useGravatars');
+        this.enableGravatars = await this.storageService.get<boolean>('enableGravatars');
         this.locale = this.startingLocale = await this.storageService.get<string>(ConstantsService.localeKey);
     }
 
@@ -67,8 +67,8 @@ export class OptionsComponent implements OnInit {
         await this.lockService.setLockOption(this.lockOption != null ? this.lockOption : null);
         await this.storageService.save(ConstantsService.disableFaviconKey, this.disableIcons);
         await this.stateService.save(ConstantsService.disableFaviconKey, this.disableIcons);
-        await this.storageService.save('useGravatars', this.useGravatars);
-        await this.stateService.save('useGravatars', this.useGravatars);
+        await this.storageService.save('enableGravatars', this.enableGravatars);
+        await this.stateService.save('enableGravatars', this.enableGravatars);
         await this.storageService.save(ConstantsService.localeKey, this.locale);
         this.analytics.eventTrack.next({ action: 'Saved Options' });
         if (this.locale !== this.startingLocale) {
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 5b46c2518c..009b38c318 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -958,11 +958,11 @@
   "disableIconsDesc": {
     "message": "Website Icons provide a recognizable image next to each login item in your vault."
   },
-  "useGravatars": {
-    "message": "Use Gravatars",
+  "enableGravatars": {
+    "message": "Enable Gravatars",
     "description": "'Gravatar' is the name of a service. See www.gravatar.com"
   },
-  "useGravatarsDesc": {
+  "enableGravatarsDesc": {
     "message": "Use avatar images loaded from gravatar.com."
   },
   "default": {
diff --git a/src/services/htmlStorage.service.ts b/src/services/htmlStorage.service.ts
index 4d83238acc..1b9810326c 100644
--- a/src/services/htmlStorage.service.ts
+++ b/src/services/htmlStorage.service.ts
@@ -4,7 +4,7 @@ import { ConstantsService } from 'jslib/services';
 
 export class HtmlStorageService implements StorageService {
     private localStorageKeys = new Set(['appId', 'anonymousAppId', 'rememberedEmail', 'passwordGenerationOptions',
-        ConstantsService.disableFaviconKey, ConstantsService.lockOptionKey, 'rememberEmail',
+        ConstantsService.disableFaviconKey, ConstantsService.lockOptionKey, 'rememberEmail', 'enableGravatars',
         ConstantsService.localeKey, ConstantsService.lockOptionKey]);
     private localStorageStartsWithKeys = ['twoFactorToken_'];