diff --git a/openstack/code/Company.php b/openstack/code/Company.php
index 2fd49a3..4fa24aa 100644
--- a/openstack/code/Company.php
+++ b/openstack/code/Company.php
@@ -534,6 +534,10 @@ class Company extends DataObject implements PermissionProvider {
         return  $this->CompanyAdminID == $MemberID  || Permission::check("DELETE_COMPANY") || $this->PermissionCheck(array("DELETE_COMPANY"));
     }
 
+	public function canView($member = null) {
+		$MemberID = Member::currentUserID();
+		return  $this->CompanyAdminID == $MemberID  || Permission::check("EDIT_COMPANY") || $this->PermissionCheck(array("EDIT_COMPANY"));
+	}
 
     /*
      * Helper method to check if current user has the permissions
diff --git a/openstack/code/GroupDecorator.php b/openstack/code/GroupDecorator.php
index 65a6371..ff8f942 100644
--- a/openstack/code/GroupDecorator.php
+++ b/openstack/code/GroupDecorator.php
@@ -32,10 +32,10 @@ class GroupDecorator extends DataExtension {
         $detailFormFields = new FieldList(
             new TabSet("Root",
                 new Tab('Main', 'Main',
-                    new HeaderField('MemberDetailsHeader',_t('Member.PERSONALDETAILS', "Personal Details", PR_MEDIUM, 'Headline for formfields')),
+                    new HeaderField('MemberDetailsHeader', "Personal Details"),
                     new TextField("FirstName","First Name"),
                     new TextField("Surname","Last Name"),
-                    new HeaderField('MemberUserDetailsHeader',_t('Member.USERDETAILS', "User Details", PR_MEDIUM, 'Headline for formfields')),
+                    new HeaderField('MemberUserDetailsHeader',"User Details"),
                     new ConfirmedPasswordField(
                         'Password',
                         null,