Merge branch 'master' into dev

1 files changed, 4 insertions, 2 deletions

diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 822f5a16..2f0bd189 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -45,8 +45,6 @@ function sanitizeOptions(options) {
         dictionaries: {},
 
         ankiMethod: 'disabled',
-        ankiUsername: '',
-        ankiPassword: '',
         ankiCardTags: ['yomichan'],
         sentenceExtent: 200,
 
@@ -64,6 +62,10 @@ function sanitizeOptions(options) {
         }
     }
 
+    if (options.ankiMethod === 'ankiweb') {
+        options.ankiMethod = 'disabled';
+    }
+
     return options;
 }