diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 73fd72f0942..f7b678999b8 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -186,11 +186,13 @@ jQuery(document).ready(function () {
 		</td></tr></table></center><br>
 	<?php } ?>
 
-	<?php if ($main_google_ad_client) { ?>
+	<?php
+	if (! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))
+	{
+	?>
 		<div align="center">
 			<script type="text/javascript"><!--
 				google_ad_client = "<?php echo $conf->global->MAIN_GOOGLE_AD_CLIENT ?>";
-				/* <?php echo $conf->global->MAIN_GOOGLE_AD_NAME; ?> */
 				google_ad_slot = "<?php echo $conf->global->MAIN_GOOGLE_AD_SLOT ?>";
 				google_ad_width = <?php echo $conf->global->MAIN_GOOGLE_AD_WIDTH ?>;
 				google_ad_height = <?php echo $conf->global->MAIN_GOOGLE_AD_HEIGHT ?>;
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index bb5f4d0613e..44358140074 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -318,7 +318,6 @@ if (! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN
 	print '<div align="center">'."\n";
 	print '<script type="text/javascript"><!--'."\n";
 	print 'google_ad_client = "'.$conf->global->MAIN_GOOGLE_AD_CLIENT.'";'."\n";
-	print '/* '.$conf->global->MAIN_GOOGLE_AD_NAME.' */'."\n";
 	print 'google_ad_slot = "'.$conf->global->MAIN_GOOGLE_AD_SLOT.'";'."\n";
 	print 'google_ad_width = '.$conf->global->MAIN_GOOGLE_AD_WIDTH.';'."\n";
 	print 'google_ad_height = '.$conf->global->MAIN_GOOGLE_AD_HEIGHT.';'."\n";