diff --git a/src/Chamilo/CoreBundle/Migrations/AbstractMigrationChamilo.php b/src/Chamilo/CoreBundle/Migrations/AbstractMigrationChamilo.php
index 7ef501b69b..b519265d10 100644
--- a/src/Chamilo/CoreBundle/Migrations/AbstractMigrationChamilo.php
+++ b/src/Chamilo/CoreBundle/Migrations/AbstractMigrationChamilo.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Migrations;
 
@@ -33,29 +34,31 @@ abstract class AbstractMigrationChamilo extends AbstractMigration
 
     /**
      * Speeds up SettingsCurrent creation
-     * @param   string  $variable   The variable itself
-     * @param   string  $subKey The subkey
-     * @param   string  $type   The type of setting (text, radio, select, etc)
-     * @param   string  $category   The category (Platform, User, etc)
-     * @param   string  $selectedValue  The default value
-     * @param   string  $title  The setting title string name
-     * @param   string  $comment    The setting comment string name
-     * @param   string  $scope  The scope
-     * @param   string  $subKeyText Text if there is a subKey
-     * @param   int  $accessUrl  What URL it is for
-     * @param   bool    $accessUrlChangeable Whether it can be changed on each url
-     * @param   bool    $accessUrlLocked Whether the setting for the current URL is locked to the current value
-     * @param   array   $options    Optional array in case of a radio-type field, to insert options
+     * @param string $variable The variable itself
+     * @param string $subKey The subkey
+     * @param string $type The type of setting (text, radio, select, etc)
+     * @param string $category The category (Platform, User, etc)
+     * @param string $selectedValue The default value
+     * @param string $title The setting title string name
+     * @param string $comment The setting comment string name
+     * @param string $scope The scope
+     * @param string $subKeyText Text if there is a subKey
+     * @param int $accessUrl What URL it is for
+     * @param bool $accessUrlChangeable Whether it can be changed on each url
+     * @param bool $accessUrlLocked Whether the setting for the current URL is
+     * locked to the current value
+     * @param array $options Optional array in case of a radio-type field,
+     * to insert options
      */
     public function addSettingCurrent(
         $variable,
-        $subKey = '',
+        $subKey,
         $type,
         $category,
         $selectedValue,
         $title,
         $comment,
-        $scope = null,
+        $scope = '',
         $subKeyText = '',
         $accessUrl = 1,
         $accessUrlChangeable = false,
@@ -63,25 +66,25 @@ abstract class AbstractMigrationChamilo extends AbstractMigration
         $options = array()
     ) {
         $setting = new SettingsCurrent();
-        $setting->setVariable($variable);
-        $setting->setSubkey($subKey);
-        $setting->setType($type);
-        $setting->setCategory($category);
-        $setting->setSelectedValue($selectedValue);
-        $setting->setTitle($title);
-        $setting->setComment($comment);
-        $setting->setScope($scope);
-        $setting->setSubkeytext($subKeyText);
-        $setting->setAccessUrl($accessUrl);
-        $setting->setAccessUrlChangeable($accessUrlChangeable);
-        $setting->setAccessUrlLocked($accessUrlLocked);
+        $setting
+            ->setVariable($variable)
+            ->setSubkey($subKey)
+            ->setType($type)
+            ->setCategory($category)
+            ->setSelectedValue($selectedValue)
+            ->setTitle($title)
+            ->setComment($comment)
+            ->setScope($scope)
+            ->setSubkeytext($subKeyText)
+            ->setAccessUrl($accessUrl)
+            ->setAccessUrlChangeable($accessUrlChangeable)
+            ->setAccessUrlLocked($accessUrlLocked);
+
         $this->getEntityManager()->persist($setting);
         $this->getEntityManager()->flush();
+
         if (count($options) > 0) {
             foreach ($options as $option) {
-                $option = new SettingsOptions();
-                $option->setVariable($variable);
-                $option->setValue($option['value']);
                 if (empty($option['text'])) {
                     if ($option['value'] == 'true') {
                         $option['text'] = 'Yes';
@@ -89,8 +92,12 @@ abstract class AbstractMigrationChamilo extends AbstractMigration
                         $option['text'] = 'No';
                     }
                 }
-                $option->setDisplayText($option['text']);
-                $this->getEntityManager()->persis($option);
+                $settingOption = new SettingsOptions();
+                $settingOption
+                    ->setVariable($variable)
+                    ->setValue($option['value'])
+                    ->setDisplayText($option['text']);
+                $this->getEntityManager()->persist($settingOption);
                 $this->getEntityManager()->flush();
             }
         }