diff --git a/page.tpl.php b/page.tpl.php
index 6a68dc4..aba3952 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -3,7 +3,7 @@
   <div id="header" class='reverse'><div class='limiter clearfix'>
       <?php if (isset($logo)): ?>
       <div class="logo">
-        <a href="<?php print $front_page; ?>"><img src="<?php print $svg_logo; ?>" onerror="this.src='<?php print $logo; ?>'" /></a>
+        <a href="<?php print $front_page; ?>"><img src="<?php if (isset($svg_logo)): print $svg_logo; else: print $logo; endif ?>" /></a>
       </div>
       <?php endif; ?>
     <?php if ($site_name): ?><div class='site-name'><?php print $site_name ?></div><?php endif; ?>
diff --git a/templates/page--user--login.tpl.php b/templates/page--user--login.tpl.php
index 6beb4ea..1e8e3e4 100644
--- a/templates/page--user--login.tpl.php
+++ b/templates/page--user--login.tpl.php
@@ -2,7 +2,7 @@
   <div id="top_part">
       <?php if (isset($logo)): ?>
         <h1 id="the_logo">
-          <a href="<?php print $front_page; ?>"><img src="<?php print $svg_logo; ?>" onerror="this.src='<?php print $logo; ?>'" /></a>
+          <a href="<?php print $front_page; ?>"><img src="<?php if (isset($svg_logo)): print $svg_logo; else: print $logo; endif ?>" /></a>
         </h1>
       <?php endif; ?>
   </div>
diff --git a/templates/page--user--password.tpl.php b/templates/page--user--password.tpl.php
index e7c90a7..6518c6e 100644
--- a/templates/page--user--password.tpl.php
+++ b/templates/page--user--password.tpl.php
@@ -2,7 +2,7 @@
   <div id="top_part">
     <?php if (isset($logo)): ?>
       <h1 id="the_logo">
-        <a href="<?php print $front_page; ?>"><img src="<?php print $svg_logo; ?>" onerror="this.src='<?php print $logo; ?>'" /></a>
+        <a href="<?php print $front_page; ?>"><img src="<?php if (isset($svg_logo)): print $svg_logo; else: print $logo; endif ?>" /></a>
       </h1>
     <?php endif; ?>
   </div>
diff --git a/templates/page--user--register.tpl.php b/templates/page--user--register.tpl.php
index 523d1d2..a540f71 100644
--- a/templates/page--user--register.tpl.php
+++ b/templates/page--user--register.tpl.php
@@ -2,7 +2,7 @@
   <div id="top_part">
     <?php if (isset($logo)): ?>
       <h1 id="the_logo">
-        <a href="<?php print $front_page; ?>"><img src="<?php print $svg_logo; ?>" onerror="this.src='<?php print $logo; ?>'" /></a>
+        <a href="<?php print $front_page; ?>"><img src="<?php if (isset($svg_logo)): print $svg_logo; else: print $logo; endif ?>" /></a>
       </h1>
     <?php endif; ?>
   </div>