diff --git a/CRM/Group/Form/Edit.php b/CRM/Group/Form/Edit.php
index aacc3fc18a7d..735a19d3c64c 100644
--- a/CRM/Group/Form/Edit.php
+++ b/CRM/Group/Form/Edit.php
@@ -90,6 +90,8 @@ public function getDefaultEntity() {
 
   /**
    * Set up variables to build the form.
+   *
+   * @throws \CRM_Core_Exception
    */
   public function preProcess() {
     $this->addOptionalQuickFormElement('parents');
@@ -130,12 +132,12 @@ public function preProcess() {
         $this->setTitle(ts('Confirm Group Delete'));
       }
       if ($this->_groupValues['is_reserved'] == 1 && !CRM_Core_Permission::check('administer reserved groups')) {
-        CRM_Core_Error::statusBounce(ts("You do not have sufficient permission to delete this reserved group."));
+        CRM_Core_Error::statusBounce(ts('You do not have sufficient permission to delete this reserved group.'));
       }
     }
     else {
       if ($this->_id && $this->_groupValues['is_reserved'] == 1 && !CRM_Core_Permission::check('administer reserved groups')) {
-        CRM_Core_Error::statusBounce(ts("You do not have sufficient permission to change settings for this reserved group."));
+        CRM_Core_Error::statusBounce(ts('You do not have sufficient permission to change settings for this reserved group.'));
       }
       if (isset($this->_id)) {
         $groupValues = array(
@@ -143,18 +145,11 @@ public function preProcess() {
           'title' => $this->_title,
           'saved_search_id' => $this->_groupValues['saved_search_id'] ?? '',
         );
-        if (isset($this->_groupValues['saved_search_id'])) {
-          $this->assign('editSmartGroupURL', CRM_Contact_BAO_SavedSearch::getEditSearchUrl($this->_groupValues['saved_search_id']));
-        }
-        if (!empty($this->_groupValues['created_id'])) {
-          $groupValues['created_by'] = CRM_Core_DAO::getFieldValue("CRM_Contact_DAO_Contact", $this->_groupValues['created_id'], 'sort_name', 'id');
-        }
-
-        if (!empty($this->_groupValues['modified_id'])) {
-          $groupValues['modified_by'] = CRM_Core_DAO::getFieldValue("CRM_Contact_DAO_Contact", $this->_groupValues['modified_id'], 'sort_name', 'id');
-        }
+        $this->assign('editSmartGroupURL', isset($this->_groupValues['saved_search_id']) ? CRM_Contact_BAO_SavedSearch::getEditSearchUrl($this->_groupValues['saved_search_id']) : NULL);
+        $groupValues['created_by'] = empty($this->_groupValues['created_id']) ? NULL : CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $this->_groupValues['created_id'], 'sort_name', 'id');
+        $groupValues['modified_by'] = empty($this->_groupValues['modified_id']) ? NULL : CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $this->_groupValues['modified_id'], 'sort_name', 'id');
 
-        $this->assign_by_ref('group', $groupValues);
+        $this->assign('group', $groupValues);
 
         $this->setTitle(ts('Group Settings: %1', array(1 => $this->_title)));
       }
diff --git a/templates/CRM/Group/Form/Edit.tpl b/templates/CRM/Group/Form/Edit.tpl
index 912a9f88f449..dc493bf44339 100644
--- a/templates/CRM/Group/Form/Edit.tpl
+++ b/templates/CRM/Group/Form/Edit.tpl
@@ -69,7 +69,7 @@
       <td>{$form.is_active.html}</td>
     </tr>
 
-   {if !empty($group.created_by)}
+   {if $group.created_by}
       <tr class="crm-group-form-block-created">
         <td class="label">{ts}Created By{/ts}</td>
         <td>{$group.created_by}</td>
@@ -105,10 +105,10 @@
 
   {literal}
   <script type="text/javascript">
-    {/literal}{if !empty($freezeMailingList)}{literal}
+    {/literal}{if $freezeMailingList}{literal}
     cj('input[type=checkbox][name="group_type[{/literal}{$freezeMailingList}{literal}]"]').prop('disabled',true);
     {/literal}{/if}{literal}
-    {/literal}{if !empty($hideMailingList)}{literal}
+    {/literal}{if $hideMailingList}{literal}
     cj('input[type=checkbox][name="group_type[{/literal}{$hideMailingList}{literal}]"]').hide();
     cj('label[for="group_type[{/literal}{$hideMailingList}{literal}]"]').hide();
     {/literal}{/if}{literal}
diff --git a/templates/CRM/Group/Form/GroupsCommon.tpl b/templates/CRM/Group/Form/GroupsCommon.tpl
index 0a78e42db5e5..3b5e5f0080e8 100644
--- a/templates/CRM/Group/Form/GroupsCommon.tpl
+++ b/templates/CRM/Group/Form/GroupsCommon.tpl
@@ -31,7 +31,7 @@
     </tr>
   </table>
 {/if}
-{if !empty($form.organization_id)}
+{if array_key_exists('organization_id', $form)}
   <h3>{ts}Associated Organization{/ts} {help id="id-group-organization" file="CRM/Group/Page/Group.hlp"}</h3>
   <table class="form-layout-compressed">
     <tr class="crm-group-form-block-organization">