diff --git a/admin/intro.php b/admin/intro.php
index 01a9a9d8d..cb0c73093 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -27,7 +27,7 @@ check_status(ACCESS_ADMINISTRATOR);
 
 if (isset($_GET['action']) and 'hide_newsletter_subscription' == $_GET['action'])
 {
-  conf_update_param('show_newsletter_subscription', 'false', true);
+  userprefs_update_param('show_newsletter_subscription', 'false');
   exit();
 }
 
@@ -81,7 +81,7 @@ fs_quick_check();
 
 $template->set_filenames(array('intro' => 'intro.tpl'));
 
-if ($conf['show_newsletter_subscription']) {
+if ($conf['show_newsletter_subscription'] and userprefs_get_param('show_newsletter_subscription', true)) {
   $template->assign(
     array(
       'EMAIL' => $user['email'],
diff --git a/install.php b/install.php
index 79df4c515..6cb577f8b 100644
--- a/install.php
+++ b/install.php
@@ -414,18 +414,6 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment)
       array_keys($datas[0]),
       $datas
       );
-
-    if ($is_newsletter_subscribe)
-    {
-      fetchRemote(
-        get_newsletter_subscribe_base_url($language).$admin_mail,
-        $result,
-        array(),
-        array('origin' => 'installation')
-        );
-
-      conf_update_param('show_newsletter_subscription', 'false');
-    }
   }
 }
 
@@ -493,6 +481,19 @@ else
     $user = build_user(1, true);
     log_user($user['id'], false);
     
+    // newsletter subscription
+    if ($is_newsletter_subscribe)
+    {
+      fetchRemote(
+        get_newsletter_subscribe_base_url($language).$admin_mail,
+        $result,
+        array(),
+        array('origin' => 'installation')
+        );
+
+      userprefs_update_param('show_newsletter_subscription', false);
+    }
+
     // email notification
     if (isset($_POST['send_credentials_by_mail']))
     {