diff --git a/administrator/components/com_config/model/application.php b/administrator/components/com_config/model/application.php
index 5f6649b1d6278..a5eecbc2538d8 100644
--- a/administrator/components/com_config/model/application.php
+++ b/administrator/components/com_config/model/application.php
@@ -127,7 +127,7 @@ public function save($data)
 				$host    = JUri::getInstance()->getHost();
 				$options = new \Joomla\Registry\Registry;
 				$options->set('userAgent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:41.0) Gecko/20100101 Firefox/41.0');
-				
+
 				// Do not check for valid server certificate here, leave this to the user, moreover disable using a proxy if any is configured.
 				$options->set('transport.curl',
 					array(
@@ -553,7 +553,6 @@ public function storePermissions($permission = null)
 				{
 					unset($temp[$permission['action']][$permission['rule']]);
 				}
-
 			}
 			else
 			{
@@ -623,7 +622,7 @@ public function storePermissions($permission = null)
 
 				$parentAssetId = (int) $this->db->loadResult();
 			}
-			
+
 			// Get the group parent id of the current group.
 			$query->clear()
 				->select($this->db->quoteName('parent_id'))
@@ -661,9 +660,18 @@ public function storePermissions($permission = null)
 		$assetRule = JAccess::getAssetRules($assetId, false, false)->allow($permission['action'], $permission['rule']);
 
 		// Get the group, group parent id, and group global config recursive calculated permission for the chosen action.
-		$inheritedGroupRule            = JAccess::checkGroup($permission['rule'], $permission['action'], $assetId);
-		$inheritedGroupParentAssetRule = !empty($parentAssetId) ? JAccess::checkGroup($permission['rule'], $permission['action'], $parentAssetId) : null;
-		$inheritedParentGroupRule      = !empty($parentGroupId) ? JAccess::checkGroup($parentGroupId, $permission['action'], $assetId) : null;
+		$inheritedGroupRule = JAccess::checkGroup($permission['rule'], $permission['action'], $assetId);
+
+		if (!empty($parentAssetId))
+		{
+			$inheritedGroupParentAssetRule = JAccess::checkGroup($permission['rule'], $permission['action'], $parentAssetId);
+		}
+		else
+		{
+			$inheritedGroupParentAssetRule = null;
+		}
+
+		$inheritedParentGroupRule = !empty($parentGroupId) ? JAccess::checkGroup($parentGroupId, $permission['action'], $assetId) : null;
 
 		// Current group is a Super User group, so calculated setting is "Allowed (Super User)".
 		if ($isSuperUserGroupAfter)
@@ -718,6 +726,7 @@ public function storePermissions($permission = null)
 				$result['class'] = 'label label-important';
 				$result['text']  = JText::_('JLIB_RULES_NOT_ALLOWED_DEFAULT');
 			}
+
 			/**
 			 * Component/Item with explicit "Denied" permission at parent Asset (Category, Component or Global config) configuration.
 			 * Or some parent group has an explicit "Denied".
@@ -748,7 +757,7 @@ public function storePermissions($permission = null)
 	/**
 	 * Method to send a test mail which is called via an AJAX request
 	 *
-	 * @return bool
+	 * @return boolean
 	 *
 	 * @since   3.5
 	 * @throws Exception
diff --git a/administrator/components/com_config/model/field/filters.php b/administrator/components/com_config/model/field/filters.php
index f3f776b392487..712000bb5f808 100644
--- a/administrator/components/com_config/model/field/filters.php
+++ b/administrator/components/com_config/model/field/filters.php
@@ -51,14 +51,16 @@ protected function getInput()
 		$html[] = '			<span class="acl-action">' . JText::_('JGLOBAL_FILTER_GROUPS_LABEL') . '</span>';
 		$html[] = '		</th>';
 		$html[] = '		<th>';
-		$html[] = '			<span class="acl-action" title="' . JText::_('JGLOBAL_FILTER_TYPE_LABEL') . '">' . JText::_('JGLOBAL_FILTER_TYPE_LABEL') . '</span>';
+		$html[] = '			<span class="acl-action" title="' . JText::_('JGLOBAL_FILTER_TYPE_LABEL') . '">'
+				. JText::_('JGLOBAL_FILTER_TYPE_LABEL') . '</span>';
 		$html[] = '		</th>';
 		$html[] = '		<th>';
-		$html[] = '			<span class="acl-action" title="' . JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '">' . JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '</span>';
+		$html[] = '			<span class="acl-action" title="' . JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '">'
+				. JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '</span>';
 		$html[] = '		</th>';
 		$html[] = '		<th>';
 		$html[] = '			<span class="acl-action" title="' . JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '">'
-			. JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '</span>';
+				. JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '</span>';
 		$html[] = '		</th>';
 		$html[] = '	</tr>';
 		$html[] = '	</thead>';
diff --git a/administrator/components/com_config/view/application/html.php b/administrator/components/com_config/view/application/html.php
index 5c16eea8e8091..2cb2d56d15039 100644
--- a/administrator/components/com_config/view/application/html.php
+++ b/administrator/components/com_config/view/application/html.php
@@ -53,6 +53,7 @@ public function render()
 		{
 			$form->bind($data);
 		}
+
 		// Get the params for com_users.
 		$usersParams = JComponentHelper::getParams('com_users');