diff --git a/interface/usergroup/mfa_totp.php b/interface/usergroup/mfa_totp.php
index d63a2b7433b..c51f0ed8f38 100644
--- a/interface/usergroup/mfa_totp.php
+++ b/interface/usergroup/mfa_totp.php
@@ -185,6 +185,8 @@ function docancel() {
                                             <br />
                                             <img src="<?php echo attr($qr); ?>" class="img-responsive center-block" style="height:200px !Important"/>
                                             <br />
+                                            <p><?php echo xlt("Or paste in the following code into your authenticator app"); ?></p>
+                                            <p><?php echo $mfaAuth->getSecret(); ?></p>
                                             <p><?php echo xlt('Example authenticator apps include'); ?></p>:
                                             <div class="col-sm-4 offset-sm-4">
                                                 <ul>
diff --git a/library/classes/Installer.class.php b/library/classes/Installer.class.php
index f0354db06dc..319d14dad11 100644
--- a/library/classes/Installer.class.php
+++ b/library/classes/Installer.class.php
@@ -490,6 +490,7 @@ public function on_care_coordination()
 
     /**
      * Generates the initial user's 2FA QR Code
+     * @deprecated Recommended to use get_initial_user_mfa_totp() instead
      * @return bool|string|void
      */
     public function get_initial_user_2fa_qr()
@@ -502,6 +503,19 @@ public function get_initial_user_2fa_qr()
         return false;
     }
 
+    /**
+     * Generates the initial user's 2FA QR Code
+     * @return bool|string|void
+     */
+    public function get_initial_user_mfa_totp()
+    {
+        if (($this->i2faEnable) && (!empty($this->i2faSecret)) && (class_exists('Totp'))) {
+            $adminTotp = new Totp($this->i2faSecret, $this->iuser);
+            return $adminTotp;
+        }
+        return false;
+    }
+
   /**
    * Create site directory if it is missing.
    * @global string $GLOBALS['OE_SITE_DIR'] contains the name of the site directory to create
diff --git a/setup.php b/setup.php
index e2640a47d87..35e8be9a55e 100644
--- a/setup.php
+++ b/setup.php
@@ -1375,9 +1375,11 @@ function cloneClicked() {
                     }
 
                     // If user has selected to set MFA App Based 2FA, display QR code to scan
-                    $qr = $installer->get_initial_user_2fa_qr();
-                    $qr_esc = attr($qr);
-                    if ($qr) {
+                    $mfa = $installer->get_initial_user_mfa_totp();
+                    if ($mfa !== false) {
+                        $qr = $mfa->generateQrCode();
+                        $qr_esc = attr($qr);
+                        $sharedSecret = text($mfa->getSecret());
                         $qrDisplay = <<<TOTP
                                     <br />
                                     <table>
@@ -1386,6 +1388,8 @@ function cloneClicked() {
                                                 <strong class='text-danger'>IMPORTANT!!</strong>
                                                 <p><strong>You must scan the following QR code with your preferred authenticator app.</strong></p>
                                                 <img src='$qr_esc' width="150" />
+                                                <p>Or paste in the following code into your authenticator app</p>
+                                                <p>$sharedSecret</p>
                                             </td>
                                         </tr>
                                         <tr>