diff --git a/README b/README
index a55c2784..453849cd 100644
--- a/README
+++ b/README
@@ -34,6 +34,8 @@ Features:
 
 - STARTTLS support
 
+- Google Authenticator support for 2-factor authentication
+
 - i18n
 - customisable theme
 
diff --git a/webui/qr.php b/webui/qr.php
index 929012c8..33f19697 100644
--- a/webui/qr.php
+++ b/webui/qr.php
@@ -38,6 +38,6 @@ else if(isset($_GET['toggle'])) {
 
 $ga = $p->get_ga_settings($session->get('username'));
 
-QRcode::png($ga['ga_secret'], false, "L", 8, 2);
+QRcode::png("otpauth://totp/" . SITE_NAME . "?secret=" . $ga['ga_secret'], false, "L", 8, 2);
 
 ?>