diff --git a/src/backend/routes/views/account/get/connectSteam.js b/src/backend/routes/views/account/get/connectSteam.js
index 4d1e2353..9dd1964a 100644
--- a/src/backend/routes/views/account/get/connectSteam.js
+++ b/src/backend/routes/views/account/get/connectSteam.js
@@ -9,7 +9,7 @@ exports = module.exports = function (req, res) {
 
     request.post({
         url: process.env.API_URL + '/users/buildSteamLinkUrl',
-        headers: { Authorization: 'Bearer ' + req.services.userService.getUser()?.oAuthPassport.token },
+        headers: { Authorization: 'Bearer ' + req.requestContainer.get('UserService').getUser()?.oAuthPassport.token },
         form: { callbackUrl: req.protocol + '://' + req.get('host') + '/account/link?done' }
     }, function (err, res, body) {
         if (err) {
diff --git a/src/backend/routes/views/account/get/linkGog.js b/src/backend/routes/views/account/get/linkGog.js
index 05ab5363..67191ba5 100644
--- a/src/backend/routes/views/account/get/linkGog.js
+++ b/src/backend/routes/views/account/get/linkGog.js
@@ -27,7 +27,7 @@ exports = module.exports = function (req, res) {
 
     request.get({
         url: process.env.API_URL + '/users/buildGogProfileToken',
-        headers: { Authorization: 'Bearer ' + req.services.userService.getUser()?.oAuthPassport.token },
+        headers: { Authorization: 'Bearer ' + req.requestContainer.get('UserService').getUser()?.oAuthPassport.token },
         form: {}
     }, function (err, res, body) {
         locals.gogToken = 'unable to obtain token'
diff --git a/src/backend/routes/views/account/get/resync.js b/src/backend/routes/views/account/get/resync.js
index a89fb287..2cbd71be 100644
--- a/src/backend/routes/views/account/get/resync.js
+++ b/src/backend/routes/views/account/get/resync.js
@@ -15,7 +15,7 @@ exports = module.exports = function (req, res) {
 
     request.post({
         url: process.env.API_URL + '/users/resyncAccount',
-        headers: { Authorization: 'Bearer ' + req.services.userService.getUser()?.oAuthPassport.token }
+        headers: { Authorization: 'Bearer ' + req.requestContainer.get('UserService').getUser()?.oAuthPassport.token }
     }, function (err, res, body) {
         if (err || res.statusCode !== 200) {
             error.parseApiErrors(body, flash)
diff --git a/src/backend/routes/views/account/post/changeEmail.js b/src/backend/routes/views/account/post/changeEmail.js
index 2f327f37..0c006e93 100644
--- a/src/backend/routes/views/account/post/changeEmail.js
+++ b/src/backend/routes/views/account/post/changeEmail.js
@@ -33,7 +33,7 @@ exports = module.exports = function (req, res) {
 
         request.post({
             url: `${process.env.API_URL}/users/changeEmail`,
-            headers: { Authorization: `Bearer ${req.services.userService.getUser()?.oAuthPassport.token}` },
+            headers: { Authorization: `Bearer ${req.requestContainer.get('UserService').getUser()?.oAuthPassport.token}` },
             form: { newEmail: email, currentPassword: password }
         }, function (err, res, body) {
             if (err || res.statusCode !== 200) {
diff --git a/src/backend/routes/views/account/post/changePassword.js b/src/backend/routes/views/account/post/changePassword.js
index dab8c169..b1e790f7 100644
--- a/src/backend/routes/views/account/post/changePassword.js
+++ b/src/backend/routes/views/account/post/changePassword.js
@@ -32,15 +32,13 @@ exports = module.exports = function (req, res) {
         // Encrypt password before sending it off to endpoint
         const newPassword = req.body.password
         const oldPassword = req.body.old_password
-        const username = req.body.username
-
         const overallRes = res
 
         // Run post to reset endpoint
         request.post({
             url: process.env.API_URL + '/users/changePassword',
-            headers: { Authorization: 'Bearer ' + req.services.userService.getUser()?.oAuthPassport.token },
-            form: { name: username, currentPassword: oldPassword, newPassword }
+            headers: { Authorization: 'Bearer ' + req.requestContainer.get('UserService').getUser()?.oAuthPassport.token },
+            form: { currentPassword: oldPassword, newPassword }
         }, function (err, res, body) {
             if (err || res.statusCode !== 200) {
                 error.parseApiErrors(body, flash)
diff --git a/src/backend/routes/views/account/post/changeUsername.js b/src/backend/routes/views/account/post/changeUsername.js
index d66db6b8..0de42722 100644
--- a/src/backend/routes/views/account/post/changeUsername.js
+++ b/src/backend/routes/views/account/post/changeUsername.js
@@ -31,7 +31,7 @@ exports = module.exports = function (req, res) {
         // Run post to reset endpoint
         request.post({
             url: process.env.API_URL + '/users/changeUsername',
-            headers: { Authorization: 'Bearer ' + req.services.userService.getUser()?.oAuthPassport.token },
+            headers: { Authorization: 'Bearer ' + req.requestContainer.get('UserService').getUser()?.oAuthPassport.token },
             form: { newUsername: username }
         }, function (err, res, body) {
             if (err || res.statusCode !== 200) {
diff --git a/src/backend/routes/views/account/post/linkGog.js b/src/backend/routes/views/account/post/linkGog.js
index 31fc1c82..17a341e6 100644
--- a/src/backend/routes/views/account/post/linkGog.js
+++ b/src/backend/routes/views/account/post/linkGog.js
@@ -31,7 +31,7 @@ exports = module.exports = function (req, res) {
 
         request.post({
             url: process.env.API_URL + '/users/linkToGog',
-            headers: { Authorization: 'Bearer ' + req.services.userService.getUser()?.oAuthPassport.token },
+            headers: { Authorization: 'Bearer ' + req.requestContainer.get('UserService').getUser()?.oAuthPassport.token },
             form: { gogUsername }
         }, function (err, res, body) {
             if (!err && res.statusCode === 200) {
@@ -49,7 +49,7 @@ exports = module.exports = function (req, res) {
                 // it's not possible to extract it into a separate function while saving any code
                 request.get({
                     url: process.env.API_URL + '/users/buildGogProfileToken',
-                    headers: { Authorization: 'Bearer ' + req.services.userService.getUser()?.oAuthPassport.token },
+                    headers: { Authorization: 'Bearer ' + req.requestContainer.get('UserService').getUser()?.oAuthPassport.token },
                     form: {}
                 }, function (err, res, body) {
                     locals.gogToken = 'unable to obtain token'
diff --git a/src/backend/templates/views/account/changePassword.pug b/src/backend/templates/views/account/changePassword.pug
index 8a8c8a3e..c5a08598 100644
--- a/src/backend/templates/views/account/changePassword.pug
+++ b/src/backend/templates/views/account/changePassword.pug
@@ -16,7 +16,6 @@ block content
         .row
             .col-md-offset-3.col-md-6
                 form(method='post',action="/account/changePassword",data-toggle="validator")
-                    +username
                     +oldPassword('Old')
                     +confirm-password('','New')
                     .form-actions