diff --git a/extension.json b/extension.json
index 77e52ce3..e46c4c41 100644
--- a/extension.json
+++ b/extension.json
@@ -156,6 +156,7 @@
 			},
 			"dependencies": [
 				"mediawiki.api",
+				"mediawiki.api.options",
 				"mediawiki.cookie",
 				"jquery.client",
 				"jquery.cookie"
@@ -219,7 +220,8 @@
 			"scripts": "js/ext.uls.preferences.js",
 			"dependencies": [
 				"mediawiki.user",
-				"mediawiki.api"
+				"mediawiki.api",
+				"mediawiki.api.options"
 			],
 			"localBasePath": "resources",
 			"remoteExtPath": "UniversalLanguageSelector/resources"
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 4dae749d..b0c18ae8 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -82,12 +82,7 @@
 			}
 
 			api = new mw.Api();
-			// @todo Change this to api.saveOption when ULS minimum MW version is 1.25
-			api.postWithToken( 'options', {
-				action: 'options',
-				optionname: 'language',
-				optionvalue: language
-			} )
+			api.saveOption( 'language', language )
 			.done( function () {
 				location.reload();
 			} )
diff --git a/resources/js/ext.uls.preferences.js b/resources/js/ext.uls.preferences.js
index 3316c856..4970ccdd 100644
--- a/resources/js/ext.uls.preferences.js
+++ b/resources/js/ext.uls.preferences.js
@@ -149,11 +149,10 @@
 				callback.call( this, true );
 			} else {
 				// Logged in user. Use MW APIs to change preferences
-				new mw.Api().postWithToken( 'options', {
-					action: 'options',
-					optionname: ulsPreferences.preferenceName,
-					optionvalue: JSON.stringify( ulsPreferences.preferences )
-				} ).done( function () {
+				new mw.Api().saveOption(
+					ulsPreferences.preferenceName,
+					JSON.stringify( ulsPreferences.preferences )
+				).done( function () {
 					callback.call( this, true );
 				} ).fail( function () {
 					callback.call( this, false );