diff --git a/src/oauth2views/login.ejs b/src/oauth2views/login.ejs
index 0068051cf..42ed43a24 100644
--- a/src/oauth2views/login.ejs
+++ b/src/oauth2views/login.ejs
@@ -32,7 +32,7 @@
             <input type="password" class="form-control" name="password" id="inputPassword" value="<%= password %>" required>
           </div>
           <div class="form-group">
-            <label class="control-label" for="inputPassword">2fa Token (if enabled)</label>
+            <label class="control-label" for="inputPassword">2FA Token (if enabled)</label>
             <input type="text" class="form-control" name="totpToken" id="inputTotpToken" value="">
           </div>
           <input class="btn btn-primary btn-outline pull-right" type="submit" value="Sign in"/>
diff --git a/src/routes/oauth2.js b/src/routes/oauth2.js
index 5c3670c5f..99bfba1fc 100644
--- a/src/routes/oauth2.js
+++ b/src/routes/oauth2.js
@@ -257,13 +257,13 @@ function login(req, res) {
     })(req, res, function () {
         if (req.user.twoFactorAuthenticationEnabled) {
             if (!req.body.totpToken) {
-                let failureQuery = querystring.stringify({ error: 'A 2fa token is required', returnTo: returnTo });
+                let failureQuery = querystring.stringify({ error: 'A 2FA token is required', returnTo: returnTo });
                 return res.redirect('/api/v1/session/login?' + failureQuery);
             }
 
             let verified = speakeasy.totp.verify({ secret: req.user.twoFactorAuthenticationSecret, encoding: 'base32', token: req.body.totpToken });
             if (!verified) {
-                let failureQuery = querystring.stringify({ error: 'The 2fa token is invalid', returnTo: returnTo });
+                let failureQuery = querystring.stringify({ error: 'The 2FA token is invalid', returnTo: returnTo });
                 return res.redirect('/api/v1/session/login?' + failureQuery);
             }
         }
diff --git a/src/routes/test/oauth2-test.js b/src/routes/test/oauth2-test.js
index 095752320..306da16fa 100644
--- a/src/routes/test/oauth2-test.js
+++ b/src/routes/test/oauth2-test.js
@@ -692,7 +692,7 @@ describe('OAuth2', function () {
             });
         });
 
-        describe('loginForm 2fa submit', function () {
+        describe('loginForm 2FA submit', function () {
             var secret, accessToken;
 
             before(function (done) {
@@ -757,7 +757,7 @@ describe('OAuth2', function () {
                         expect(response.statusCode).to.eql(302);
 
                         var tmp = urlParse(response.headers.location, true);
-                        expect(tmp.query.error).to.eql('A 2fa token is required');
+                        expect(tmp.query.error).to.eql('A 2FA token is required');
                         expect(tmp.query.returnTo).to.eql('/api/v1/oauth/dialog/authorize?redirect_uri=' + CLIENT_2.redirectURI + '&client_id=' + CLIENT_2.id + '&response_type=code');
 
                         done();
@@ -779,7 +779,7 @@ describe('OAuth2', function () {
                         expect(response.statusCode).to.eql(302);
 
                         var tmp = urlParse(response.headers.location, true);
-                        expect(tmp.query.error).to.eql('The 2fa token is invalid');
+                        expect(tmp.query.error).to.eql('The 2FA token is invalid');
                         expect(tmp.query.returnTo).to.eql('/api/v1/oauth/dialog/authorize?redirect_uri=' + CLIENT_2.redirectURI + '&client_id=' + CLIENT_2.id + '&response_type=code');
 
                         done();