Index: page.tpl.php
===================================================================
--- page.tpl.php	(revision 278)
+++ page.tpl.php	(working copy)
@@ -33,11 +33,11 @@
           <div id="header-first">
             <?php if ($logo): ?> 
             <div id="logo">
-              <a href="<?php print $base_path ?>" title="<?php print t('Home') ?>"><img src="<?php print $logo ?>" alt="<?php print t('Home') ?>" /></a>
+              <a href="<?php print check_url($front_page) ?>" title="<?php print t('Home') ?>"><img src="<?php print $logo ?>" alt="<?php print t('Home') ?>" /></a>
             </div>
             <?php endif; ?>
             <?php if ($site_name): ?>
-            <h1><a href="<?php print $base_path ?>" title="<?php print t('Home'); ?>"><?php print $site_name; ?></a></h1>
+            <h1><a href="<?php print check_url($front_page) ?>" title="<?php print t('Home'); ?>"><?php print $site_name; ?></a></h1>
             <?php endif; ?>
             <?php if ($site_slogan): ?>
             <span id="slogan"><?php print $site_slogan; ?></span>