diff --git a/resources/skins.minerva.mainMenu/schema.js b/resources/skins.minerva.mainMenu/schema.js
index d9708e4..c65b059 100644
--- a/resources/skins.minerva.mainMenu/schema.js
+++ b/resources/skins.minerva.mainMenu/schema.js
@@ -7,7 +7,8 @@ mw.loader.using( [
 	'ext.eventLogging.subscriber'
 ] ).then( function () {
 	var M = mw.mobileFrontend,
-		user = M.require( 'mobile.startup/user' ),
+		user = mw.user,
+		editCount = mw.config.get( 'wgUserEditCount' ),
 		// Schema provided by ext.eventLogging.subscriber class
 		Schema = mw.eventLog.Schema, // resource-modules-disable-line
 		context = M.require( 'mobile.startup/context' ),
@@ -37,7 +38,8 @@ mw.loader.using( [
 			{
 				mobileMode: context.getMode(),
 				username: user.getName() || undefined,
-				userEditCount: typeof user.getEditCount() === 'number' ? user.getEditCount() : undefined
+				// FIXME: Use edit bucket here (T210106)
+				userEditCount: typeof editCount === 'number' ? editCount : undefined
 			}
 		);
 
diff --git a/resources/skins.minerva.options/categories.js b/resources/skins.minerva.options/categories.js
index 74b14ca..6930b3e 100644
--- a/resources/skins.minerva.options/categories.js
+++ b/resources/skins.minerva.options/categories.js
@@ -3,7 +3,7 @@
 	var loader = M.require( 'mobile.startup/rlModuleLoader' ),
 		features = mw.config.get( 'wgMinervaFeatures', {} ),
 		overlayManager = M.require( 'skins.minerva.scripts/overlayManager' ),
-		user = M.require( 'mobile.startup/user' );
+		isAnon = mw.user.isAnon();
 
 	// check the categories feature has been turned on
 	if ( !features.categories ) {
@@ -21,7 +21,7 @@
 			loadingOverlay.hide();
 			return new CategoryOverlay( {
 				api: new mw.Api(),
-				isAnon: user.isAnon(),
+				isAnon: isAnon,
 				title: M.getCurrentPage().title
 			} );
 		} );
@@ -35,7 +35,7 @@
 			loadingOverlay.hide();
 			return new CategoryAddOverlay( {
 				api: new mw.Api(),
-				isAnon: user.isAnon(),
+				isAnon: isAnon,
 				title: M.getCurrentPage().title
 			} );
 		} );
diff --git a/resources/skins.minerva.watchstar/init.js b/resources/skins.minerva.watchstar/init.js
index a03f134..06bee6b 100644
--- a/resources/skins.minerva.watchstar/init.js
+++ b/resources/skins.minerva.watchstar/init.js
@@ -1,7 +1,7 @@
 ( function ( M ) {
 
 	var Watchstar = M.require( 'mobile.watchstar/Watchstar' ),
-		user = M.require( 'mobile.startup/user' );
+		user = mw.user;
 
 	/**
 	 * Toggle the watch status of a known page