diff --git a/openstack/code/Company.php b/openstack/code/Company.php
index 4fa24aa..de4c703 100644
--- a/openstack/code/Company.php
+++ b/openstack/code/Company.php
@@ -514,6 +514,10 @@ class Company extends DataObject implements PermissionProvider {
 					}
 				}
 			}
+			else{
+				DB::query("DELETE FROM Company_Administrators WHERE CompanyID={$this->ID} AND MemberID={$member->ID};");
+				DB::query("INSERT INTO Company_Administrators (GroupID,CompanyID,MemberID) VALUES (0,{$this->ID},{$member->ID});");
+			}
 		}
 	}
 
diff --git a/registration/code/MemberDecorator.php b/registration/code/MemberDecorator.php
index f4d9ca5..61c1907 100644
--- a/registration/code/MemberDecorator.php
+++ b/registration/code/MemberDecorator.php
@@ -255,5 +255,15 @@ class MemberDecorator extends DataExtension {
         }
         return $res;
     }
+
+	public function canView($member = null) {
+		$res = Permission::check("EDIT_COMPANY");
+		return $res;
+	}
+
+	public function canEdit($member = null) {
+		$res = Permission::check("EDIT_COMPANY");
+		return $res;
+	}
 }