diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
index beb3447c16a..5558e217302 100644
--- a/application/controllers/admin/surveyadmin.php
+++ b/application/controllers/admin/surveyadmin.php
@@ -149,7 +149,8 @@ public function newsurvey()
         $aData                = $this->_generalTabNewSurvey();
         $aData                = array_merge($aData, $this->_getGeneralTemplateData(0));
         $aData['esrow']       = $esrow;
-        
+        $aData['oSurvey']       = $survey;
+
         //Prepare the edition panes
 
         $aData['edittextdata']              = array_merge($aData, $this->_getTextEditData($survey));
@@ -162,6 +163,7 @@ public function newsurvey()
         $aViewUrls[]          = 'newSurvey_view';
 
         $arrayed_data                                              = array();
+        $arrayed_data['oSurvey']                                   = $survey;
         $arrayed_data['data']                                      = $aData;
         $arrayed_data['title_bar']['title']                        = gT('New survey');
         $arrayed_data['fullpagebar']['savebutton']['form']         = 'addnewsurvey';
diff --git a/application/views/admin/survey/newSurvey_view.php b/application/views/admin/survey/newSurvey_view.php
index 11081770b2b..12a0be64932 100644
--- a/application/views/admin/survey/newSurvey_view.php
+++ b/application/views/admin/survey/newSurvey_view.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * Create survey
+ * @var AdminController $this
+ * @var Survey $oSurvey
  */
 ?>
 <!-- new survey view -->
diff --git a/application/views/admin/survey/subview/_create_survey_text.php b/application/views/admin/survey/subview/_create_survey_text.php
index d757ee40016..1d854cc5045 100644
--- a/application/views/admin/survey/subview/_create_survey_text.php
+++ b/application/views/admin/survey/subview/_create_survey_text.php
@@ -1,6 +1,8 @@
 <?php
 /**
 * General container for create survey action
+ * @var AdminController $this
+ * @var Survey $oSurvey
 */
 ?>
 
diff --git a/application/views/admin/survey/subview/accordion/_generaloptions_panel.php b/application/views/admin/survey/subview/accordion/_generaloptions_panel.php
index 2d000ae84df..585ee6e4812 100644
--- a/application/views/admin/survey/subview/accordion/_generaloptions_panel.php
+++ b/application/views/admin/survey/subview/accordion/_generaloptions_panel.php
@@ -126,7 +126,7 @@ function checkSelect2Languages(mylangs)
             <!-- Administrator -->
             <div class="form-group">
                 <?php //Switch for creation/editing ?>
-                <?php $admin = empty($oSurvey->admin) ? $oSurvey->owner->full_name : $oSurvey->admin; ?>
+                <?php $admin = ($oSurvey->owner ? $oSurvey->owner->full_name : $oSurvey->admin); ?>
                 <label class="col-sm-3 control-label"  for='admin'><?php  eT("Administrator:"); ?></label>
                 <div class="col-sm-9">
                     <input class="form-control" type='text' size='50' id='admin' name='admin' value="<?php echo htmlspecialchars($admin); ?>" />
@@ -136,7 +136,7 @@ function checkSelect2Languages(mylangs)
             <!-- Admin email -->
             <div class="form-group">
                 <?php //Switch for creation/editing ?>
-                <?php $admin_email = empty($oSurvey->adminemail) ? $oSurvey->owner->email : $oSurvey->adminemail; ?>
+                <?php $admin_email = $oSurvey->adminemail ? $oSurvey->owner->email : $oSurvey->adminemail; ?>
                 <label class="col-sm-3 control-label"  for='adminemail'><?php  eT("Admin email:"); ?></label>
                 <div class="col-sm-9">
                     <input class="form-control" type='email' size='50' id='adminemail' name='adminemail' value="<?php echo htmlspecialchars($admin_email); ?>" />
@@ -146,7 +146,7 @@ function checkSelect2Languages(mylangs)
             <!-- Bounce email -->
             <div class="form-group">
                 <?php //Switch for creation/editing ?>
-                <?php $bounce_email = empty($oSurvey->bounce_email) ? $oSurvey->owner->email : $oSurvey->bounce_email; ?>
+                <?php $bounce_email = ($oSurvey->bounce_email ? $oSurvey->bounce_email : $oSurvey->adminemail); ?>
                 <label class="col-sm-3 control-label"  for='bounce_email'><?php  eT("Bounce email:"); ?></label>
                 <div class="col-sm-9">
                     <input class="form-control" type='email' size='50' id='bounce_email' name='bounce_email' value="<?php echo htmlspecialchars($bounce_email); ?>" />
diff --git a/application/views/admin/survey/subview/tabCreate_view.php b/application/views/admin/survey/subview/tabCreate_view.php
index cd7d68400eb..58f7de01631 100755
--- a/application/views/admin/survey/subview/tabCreate_view.php
+++ b/application/views/admin/survey/subview/tabCreate_view.php
@@ -2,6 +2,9 @@
 /**
 * Tab Create content
 * This view display the content for the create tab.
+ * @var AdminController $this
+ * @var Survey $oSurvey
+ *
 */
 ?>
 <?php