diff --git a/guacamole/src/main/webapp/app/login/styles/dialog.css b/guacamole/src/main/webapp/app/login/styles/dialog.css
index a414003f4..c9c6a4af6 100644
--- a/guacamole/src/main/webapp/app/login/styles/dialog.css
+++ b/guacamole/src/main/webapp/app/login/styles/dialog.css
@@ -71,11 +71,36 @@
 }
 
 .login-ui .login-dialog .version {
-    font-size: 1.25em;
-    font-weight: bold;
     padding: 0.5em 0;
+}
+
+.login-ui .login-dialog .version .app-name {
+    font-weight: bold;
     text-transform: uppercase;
     text-align: center;
+    font-size: 1.25em;
+}
+
+.login-ui .login-dialog .version .version-number {
+
+    position: absolute;
+    right: 0;
+    bottom: 0;
+
+    padding: 0.25em 0.75em;
+    margin: 0.25em;
+
+    -moz-border-radius: 0.5em;
+    -webkit-border-radius: 0.5em;
+    -khtml-border-radius: 0.5em;
+    border-radius: 0.5em;
+
+    color: white;
+    background: green;
+    font-size: 0.5em;
+    font-style: italic;
+    opacity: 0.5;
+
 }
 
 .login-ui .login-dialog .logo {
diff --git a/guacamole/src/main/webapp/app/login/templates/login.html b/guacamole/src/main/webapp/app/login/templates/login.html
index 65c052083..b9d9335f4 100644
--- a/guacamole/src/main/webapp/app/login/templates/login.html
+++ b/guacamole/src/main/webapp/app/login/templates/login.html
@@ -11,7 +11,10 @@
 
                 <!-- Guacamole version -->
                 <div class="logo"></div>
-                <div class="version">{{'APP.NAME' | translate}}</div>
+                <div class="version">
+                    <div class="app-name">{{'APP.NAME' | translate}}</div>
+                    <div class="version-number">{{'APP.VERSION' | translate}}</div>
+                </div>
 
                 <!-- Login message/instructions -->
                 <p ng-show="helpText">{{helpText | translate}}</p>