diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
index cfe3faf84ca..7062dab63ee 100644
--- a/application/controllers/admin/surveyadmin.php
+++ b/application/controllers/admin/surveyadmin.php
@@ -501,30 +501,30 @@ public function view($iSurveyID, $gid = null, $qid = null)
 
         // We get the last question visited by user for this survey
         $setting_entry = 'last_question_'.App()->user->getId().'_'.$iSurveyID;
-        // TODO: getGlobalSetting() DEPRECATED
-        $lastquestion = getGlobalSetting($setting_entry);
+        $lastquestion = App()->getConfig($setting_entry);
         $setting_entry = 'last_question_'.App()->user->getId().'_'.$iSurveyID.'_gid';
-
-        // We get the list of templates
-
-        //$setting_entry = 'last_question_gid'.Yii::app()->user->getId().'_'.$iSurveyID;
-        // TODO: getGlobalSetting() DEPRECATED
-        $lastquestiongroup = getGlobalSetting($setting_entry);
-
+        $lastquestiongroup = App()->getConfig($setting_entry);
+        $aData['showLastQuestion'] = false;
         if ($lastquestion != null && $lastquestiongroup != null) {
             $aData['showLastQuestion'] = true;
             $iQid = $lastquestion;
             $iGid = $lastquestiongroup;
             $qrrow = Question::model()->findByAttributes(array('qid' => $iQid, 'gid' => $iGid, 'sid' => $iSurveyID));
-
-            $aData['last_question_name'] = $qrrow['title'];
-            if (!empty($qrrow->questionl10ns[$baselang]['question'])) {
-                $aData['last_question_name'] .= ' : '.$qrrow->questionl10ns[$baselang]['question'];
+            if($qrrow) {
+                $aData['last_question_name'] = $qrrow['title'];
+                if (!empty($qrrow->questionl10ns[$baselang]['question'])) {
+                    $aData['last_question_name'] .= ' : '.$qrrow->questionl10ns[$baselang]['question'];
+                }
+                $aData['last_question_link'] = $this->getController()->createUrl(
+                    "admin/questions",
+                    array(
+                        'sa' => 'view',
+                        'surveyid' => $iSurveyID,
+                        'gid' => $iGid,
+                        'qid' => $iQid,
+                     )
+                );
             }
-
-            $aData['last_question_link'] = $this->getController()->createUrl("admin/questions/sa/view/surveyid/$iSurveyID/gid/$iGid/qid/$iQid");
-        } else {
-            $aData['showLastQuestion'] = false;
         }
         $aData['templateapiversion'] = Template::model()->getTemplateConfiguration(null, $iSurveyID)->getApiVersion();