diff --git a/.wordpress-org/screenshot-1.png b/.wordpress-org/screenshot-1.png
index 031d6804..6d3f5774 100644
Binary files a/.wordpress-org/screenshot-1.png and b/.wordpress-org/screenshot-1.png differ
diff --git a/.wordpress-org/screenshot-2.png b/.wordpress-org/screenshot-2.png
index 4cc885b3..1c4e8590 100644
Binary files a/.wordpress-org/screenshot-2.png and b/.wordpress-org/screenshot-2.png differ
diff --git a/.wordpress-org/screenshot-3.png b/.wordpress-org/screenshot-3.png
index e7404018..fea2c9aa 100644
Binary files a/.wordpress-org/screenshot-3.png and b/.wordpress-org/screenshot-3.png differ
diff --git a/.wordpress-org/screenshot-4.png b/.wordpress-org/screenshot-4.png
index 52424bec..92ce4e1d 100644
Binary files a/.wordpress-org/screenshot-4.png and b/.wordpress-org/screenshot-4.png differ
diff --git a/.wordpress-org/screenshot-5.png b/.wordpress-org/screenshot-5.png
index 211e2d9d..8d542177 100644
Binary files a/.wordpress-org/screenshot-5.png and b/.wordpress-org/screenshot-5.png differ
diff --git a/providers/class-two-factor-totp.php b/providers/class-two-factor-totp.php
index d2549efb..d458d990 100644
--- a/providers/class-two-factor-totp.php
+++ b/providers/class-two-factor-totp.php
@@ -311,51 +311,64 @@ public function user_two_factor_options( $user ) {
 		if ( empty( $key ) ) :
 			$key      = $this->generate_key();
 			$totp_url = $this->generate_qr_code_url( $user, $key );
-
-			$datetime = wp_date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) );
-			$tz_display = wp_timezone_string();
 			?>
-			<p class="two-factor-server-datetime"
-				data-server-epoch="<?php echo esc_attr( time() ); ?>">
-				<?php
-				/* translators: 1: server date and time, 2: timezone. */
-				printf(
-					esc_html__( 'Your server date and time is %1$s (%2$s). Please verify this is correct to ensure TOTP will work.', 'two-factor' ),
-					esc_html( $datetime ),
-					esc_html( $tz_display )
-				);
-				?>
-			</p>
 			<p>
-                <?php esc_html_e( 'Please follow these steps in order to complete setup:', 'two-factor' ); ?>
-            </p>
-
-            <ol class="totp-steps">
-                <li>
-                    <?php esc_html_e( 'Install an authenticator app on your desktop/laptop and/or phone. Popular examples are Microsoft Authenticator, Google Authenticator and Authy.', 'two-factor' ); ?>
-                </li>
-                <li>
-                    <?php esc_html_e( 'Scan this QR code using the app you installed:', 'two-factor' ); ?>
-
-                    <p id="two-factor-qr-code">
-                        <a href="<?php echo esc_url( $totp_url, array( 'otpauth' ) ); ?>">
-                            <?php esc_html_e( 'Loading…', 'two-factor' ); ?>
-                            <img src="<?php echo esc_url( admin_url( 'images/spinner.gif' ) ); ?>" alt="" />
-                        </a>
-                    </p>
-
-                    <p>
-                        <?php
-                            esc_html_e(
-                                'If scanning isn’t possible or doesn’t work, use the secret key shown below to manually add the account to your chosen app:',
-                                'two-factor'
-                            );
-                        ?>
-                        <br />
-                        <code><?php echo esc_html( $key ); ?></code>
-                    </p>
-                </li>
-            </ol>
+				<?php esc_html_e( 'Please follow these steps in order to complete setup:', 'two-factor' ); ?>
+			</p>
+			<ol class="totp-steps">
+				<li>
+					<?php esc_html_e( 'Install an authenticator app on your desktop/laptop and/or phone. Popular examples are Microsoft Authenticator, Google Authenticator and Authy.', 'two-factor' ); ?>
+				</li>
+				<li>
+					<?php esc_html_e( 'Scan this QR code using the app you installed:', 'two-factor' ); ?>
+					<p id="two-factor-qr-code">
+						<a href="<?php echo esc_url( $totp_url, array( 'otpauth' ) ); ?>">
+							<?php esc_html_e( 'Loading…', 'two-factor' ); ?>
+							<img src="<?php echo esc_url( admin_url( 'images/spinner.gif' ) ); ?>" alt="" />
+						</a>
+					</p>
+					<p>
+						<?php
+							esc_html_e(
+								'If scanning isn\'t possible or doesn\'t work, click on the QR code or use the secret key shown below to add the account to your chosen app:',
+								'two-factor'
+							);
+						?>
+					</p>
+					<p>
+						<code><?php echo esc_html( $key ); ?></code>
+					</p>
+				</li>
+				<li>
+					<p><?php esc_html_e( 'Enter the code generated by the Authenticator app to complete the setup:', 'two-factor' ); ?></p>
+					<p>
+						<input type="hidden" id="two-factor-totp-key" name="two-factor-totp-key" value="<?php echo esc_attr( $key ); ?>" />
+						<label for="two-factor-totp-authcode">
+							<?php esc_html_e( 'Authentication Code:', 'two-factor' ); ?>
+							<?php
+								/* translators: Example auth code. */
+								$placeholder = sprintf( __( 'eg. %s', 'two-factor' ), '123456' );
+							?>
+							<input type="text" inputmode="numeric" name="two-factor-totp-authcode" id="two-factor-totp-authcode" class="input" value="" size="20" pattern="[0-9 ]*" placeholder="<?php echo esc_attr( $placeholder ); ?>" autocomplete="off" />
+						</label>
+						<input type="submit" class="button totp-submit" name="two-factor-totp-submit" value="<?php esc_attr_e( 'Verify', 'two-factor' ); ?>" />
+					</p>
+					<p class="description">
+						<?php
+						printf(
+							/* translators: 1: server date and time */
+							esc_html__( 'If the code is rejected, check that your web server time is accurate: %1$s. Your device and server times must match.', 'two-factor' ),
+							sprintf(
+								'<time class="two-factor-server-datetime-epoch" datetime="%1$s">%2$s (%3$s)</time>',
+								esc_attr( wp_date( 'c' ) ),
+								esc_html( wp_date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) ) ),
+								esc_html( wp_timezone_string() )
+							)
+						);
+						?>
+					</p>
+				</li>
+			</ol>
 			<style>
 				#two-factor-qr-code {
 					/* The size of the image will change based on the length of the URL inside it. */
@@ -363,7 +376,6 @@ public function user_two_factor_options( $user ) {
 					min-height: 205px;
 				}
 			</style>
-
 			<script>
 				(function(){
 					var qr_generator = function() {
@@ -397,27 +409,6 @@ public function user_two_factor_options( $user ) {
 						window.addEventListener( 'DOMContentLoaded', qr_generator );
 					}
 				})();
-			</script>
-			<hr />
-            <ol class="totp-steps" start="3">
-                <li>
-                    <?php esc_html_e( 'Enter the code generated by the Authenticator app to complete the setup:', 'two-factor' ); ?>
-                </li>
-            </ol>
-			<p>
-				<input type="hidden" id="two-factor-totp-key" name="two-factor-totp-key" value="<?php echo esc_attr( $key ); ?>" />
-				<label for="two-factor-totp-authcode">
-					<?php esc_html_e( 'Authentication Code:', 'two-factor' ); ?>
-					<?php
-						/* translators: Example auth code. */
-						$placeholder = sprintf( __( 'eg. %s', 'two-factor' ), '123456' );
-					?>
-					<input type="text" inputmode="numeric" name="two-factor-totp-authcode" id="two-factor-totp-authcode" class="input" value="" size="20" pattern="[0-9 ]*" placeholder="<?php echo esc_attr( $placeholder ); ?>" autocomplete="off" />
-				</label>
-				<input type="submit" class="button totp-submit" name="two-factor-totp-submit" value="<?php esc_attr_e( 'Verify', 'two-factor' ); ?>" />
-			</p>
-
-			<script>
 				(function($){
 					// Focus the auth code input when the checkbox is clicked.
 					document.getElementById('enabled-Two_Factor_Totp').addEventListener('click', function(e) {
@@ -459,7 +450,6 @@ public function user_two_factor_options( $user ) {
 					} );
 				})(jQuery);
 			</script>
-
 		<?php else : ?>
 			<p class="success">
 				<?php esc_html_e( 'An authenticator app is currently configured. You will need to re-scan the QR code on all devices if reset.', 'two-factor' ); ?>
@@ -724,7 +714,7 @@ protected static function pad_secret( $secret, $length ) {
 	 * @param int    $digits     The number of digits in the returned code.
 	 * @param string $hash       The hash used to calculate the code.
 	 * @param int    $time_step  The size of the time step.
-	 * 
+	 *
 	 * @throws InvalidArgumentException If the hash type is invalid.
 	 *
 	 * @return string The totp code
@@ -744,7 +734,7 @@ public static function calc_totp( $key, $step_count = false, $digits = self::DEF
 				break;
 			default:
 				throw new InvalidArgumentException( 'Invalid hash type specified!' );
-		}		
+		}
 
 		if ( false === $step_count ) {
 			$step_count = floor( self::time() / $time_step );