diff --git a/src/API/companies.js b/src/API/companies.js
index c03b471..0d5fdf2 100644
--- a/src/API/companies.js
+++ b/src/API/companies.js
@@ -58,7 +58,7 @@ export default {
    * Updates a company
    */
   update: (id: string, data: {}): Promise<any> =>
-    authFormPut(`/api/companies/${id}`, data).then(handleHttpResponse),
+    authFormPut(`/api/companies/${id}`, {company: data}).then(handleHttpResponse),
 
   /**
    * Delete a company
diff --git a/src/Screens/Admin/Company/CompanyEdit/CompanyEdit.js b/src/Screens/Admin/Company/CompanyEdit/CompanyEdit.js
index 774ffa2..f2ab296 100644
--- a/src/Screens/Admin/Company/CompanyEdit/CompanyEdit.js
+++ b/src/Screens/Admin/Company/CompanyEdit/CompanyEdit.js
@@ -73,7 +73,7 @@ const CompanyEdit = ({
       <div>
         <h1>{company.name}</h1>
         <CompanyForm
-          onSubmit={updateCompany}
+          onSubmit={(data, junk) => updateCompany(data.id, data)}
           onSubmitSuccess={onSuccess}
           initialValues={company}
         />
diff --git a/src/Screens/Admin/Company/CompanyShow/CompanyShow.js b/src/Screens/Admin/Company/CompanyShow/CompanyShow.js
index bb89e3f..54258e0 100644
--- a/src/Screens/Admin/Company/CompanyShow/CompanyShow.js
+++ b/src/Screens/Admin/Company/CompanyShow/CompanyShow.js
@@ -136,8 +136,10 @@ const CompanyShow = ({
     return 'blue';
   };
 
-  const studentInfo = ({ student: { user } }) => (
-    <>
+  const studentInfo = ({ student}) => {
+    if (!student) return null
+    const {user} = student;
+    return <>
       Name: {[user.firstName, user.lastName].join(' ')}
       <br />
       Email: {user.email}
@@ -145,7 +147,7 @@ const CompanyShow = ({
       Phone Number: {user.phoneNumber}
       <br />
     </>
-  );
+  };
 
   const options = map(
     s => (
diff --git a/src/Store/actions/Companies/CompaniesPutActions.js b/src/Store/actions/Companies/CompaniesPutActions.js
index 02e13a1..1a85982 100644
--- a/src/Store/actions/Companies/CompaniesPutActions.js
+++ b/src/Store/actions/Companies/CompaniesPutActions.js
@@ -25,7 +25,7 @@ export const updateCompanyFailure = (): UpdateCompanyFailureAction => {
   };
 };
 
-export const updateCompany = (id: string, data: {}) : any => {
+export const updateCompany = (id:string, data: {}) : any => {
   return (dispatch: Dispatch<{ type: string }>) => {
     dispatch(updateCompanyIsLoading());
     return API.companies