diff --git a/html/css/mono.css b/html/css/mono.css
index b63f759059..f5fc4ad9be 100644
--- a/html/css/mono.css
+++ b/html/css/mono.css
@@ -22,6 +22,16 @@
     color: black;
 }
 
+.panel-default>.panel-heading {
+  background: black;
+  color: white;
+}
+
+.panel-default>.panel-heading .icon-theme,
+.panel-default>.panel-heading a:visited,
+.panel-default>.panel-heading a:link {
+  color: white;
+}
 
 .twitter-typeahead .tt-hint {
     border-color: #000 !important;
diff --git a/html/includes/authentication/twofactor.lib.php b/html/includes/authentication/twofactor.lib.php
index b4acdb2b05..6157a1162c 100644
--- a/html/includes/authentication/twofactor.lib.php
+++ b/html/includes/authentication/twofactor.lib.php
@@ -161,7 +161,7 @@ function verify_hotp($key, $otp, $counter = false)
 /**
  * Print TwoFactor Input-Form
  * @param boolean $form Include FORM-tags
- * @return void|string
+ * @return string
  */
 function twofactor_form($form = true)
 {
@@ -174,7 +174,7 @@ function twofactor_form($form = true)
           <div class="panel panel-default">
             <div class="panel-heading">
               <h3 class="panel-title">
-                <img src="images/librenms_logo_light.svg">
+                <img src="' . $config['title_image'] . '">
               </h3>
             </div>
             <div class="panel-body">
@@ -189,7 +189,7 @@ function twofactor_form($form = true)
         </div>
         <div class="form-group">
           <div class="col-md-12">
-            <button type="submit" class="btn btn-default btn-block" name="submit" type="submit">Login</button>
+            <button type="submit" class="btn btn-default btn-block" name="submit">Login</button>
           </div>
          </div>
         </div>';
diff --git a/html/pages/logon.inc.php b/html/pages/logon.inc.php
index 63ba14ccab..843d71e513 100644
--- a/html/pages/logon.inc.php
+++ b/html/pages/logon.inc.php
@@ -8,13 +8,7 @@ if ($config['twofactor'] && isset($twofactorform)) {
           <div class="panel panel-default">
             <div class="panel-heading">
               <h3 class="panel-title">
-                <?php
-                if ($config['title_image']) {
-                    echo '<img src="' . $config['title_image'] . '">';
-                } else {
-                    echo '<img src="images/librenms_logo_light.svg">';
-                }
-                ?>
+                <?php echo '<img src="' . $config['title_image'] . '">'; ?>
               </h3>
             </div>
             <div class="panel-body">