More OTP updates/fixes

* Ensure email address at save
* Fix QR display issues for non-Google Auth
* More cleanup/etc.

www/otp_register.template.html

@@ -11,10 +11,12 @@
             Your OTP secret:<br>
             <b>%SECRET%</b>
         </p>
-        <p>
-            QR Code:<br>
-            <img src="%QR_IMG_DATA%"/>
-        </p>
+        <script>
+            if('googleAuth' == '%OTP_TYPE%') {
+                document.write('QR Code:<br>');
+                document.write('<img src="%QR_IMG_DATA%"/>');
+            }
+        </script>
         <form action="%POST_URL%" method="post">
             <legend>Confirm One-Time-Password to continue:</legend>
             <input type="text" placeholder="One Time Password" id="otp" name="otp" required>