diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
index 94e36c66bd8..26867cd5209 100644
--- a/application/controllers/admin/database.php
+++ b/application/controllers/admin/database.php
@@ -539,13 +539,13 @@ private function actionUpdateQuestion($iSurveyID)
         $criteria->compare('qid', $this->iQuestionID);
         $validAttributes = \LimeSurvey\Helpers\questionHelper::getQuestionAttributesSettings($sQuestionType);
         // If the question has a custom template, we first check if it provides custom attributes
-        //~ $oAttributeValues = QuestionAttribute::model()->find("qid=:qid and attribute='question_template'",array('qid'=>$cqr->qid));
-        //~ if (is_object($oAttributeValues && $oAttributeValues->value)){
-            //~ $aAttributeValues['question_template'] = $oAttributeValues->value;
-        //~ }else{
-            //~ $aAttributeValues['question_template'] = 'core';
-        //~ }
-        //~ $validAttributes    = Question::getQuestionTemplateAttributes($validAttributes, $aAttributeValues, $cqr );
+        $oAttributeValues = QuestionAttribute::model()->find("qid=:qid and attribute='question_template'",array('qid'=>$cqr->qid));
+        if (is_object($oAttributeValues) && $oAttributeValues->value ){
+            $aAttributeValues['question_template'] = $oAttributeValues->value;
+        }else{
+            $aAttributeValues['question_template'] = 'core';
+        }
+        $validAttributes    = Question::getQuestionTemplateAttributes($validAttributes, $aAttributeValues, $cqr );
         foreach ($validAttributes as  $validAttribute) {
             $criteria->compare('attribute', '<>'.$validAttribute['name']);
         }