diff --git a/app/views/fbo-admin/dashboard.controller.js b/app/views/fbo-admin/dashboard.controller.js
index 8bd3df2..706b689 100644
--- a/app/views/fbo-admin/dashboard.controller.js
+++ b/app/views/fbo-admin/dashboard.controller.js
@@ -10,7 +10,6 @@
               radioClass: 'iradio_square-green',
           });
       });
-      $scope.showCompany = true;
     	$scope.userName = 'Dylan Goodwin';
       $scope.essAccountId = true;
       $("#esAccId").css({ opacity: 0.5 });
@@ -78,9 +77,4 @@
           }
       }
 
-      $scope.editName = function(){
-        $scope.showCompany = false;
-
-      }
-
     });
\ No newline at end of file
diff --git a/app/views/fbo-admin/dashboard.html b/app/views/fbo-admin/dashboard.html
index 9ed8223..0269402 100644
--- a/app/views/fbo-admin/dashboard.html
+++ b/app/views/fbo-admin/dashboard.html
@@ -1,8 +1,8 @@
 </div>
     <div class="row wrapper border-bottom white-bg page-heading">
         <div class="col-lg-8">
-            <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2>
-            <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
+            <!-- <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2> -->
+            <div style="margin-top: 20px;"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
         </div>
         <div class="col-lg-4" style="margin-top: 20px; text-align: right;">
             <button type="button" class="btn btn-default btn-sm" ui-sref="index.fboAdmin">Cancel</button>
@@ -36,7 +36,7 @@
                         <form role="form">
                             <div class="col-sm-6 b-r">
                                     <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
-                                    <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div>
+                                    <div class="form-group"><label>Email Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div>
                                     <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
                                     <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
                                     <!-- <div>
diff --git a/app/views/fbo-flight/flight.html b/app/views/fbo-flight/flight.html
index e3e63af..da4d444 100644
--- a/app/views/fbo-flight/flight.html
+++ b/app/views/fbo-flight/flight.html
@@ -1,8 +1,8 @@
 </div>
     <div class="row wrapper border-bottom white-bg page-heading">
         <div class="col-lg-8">
-            <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2>
-            <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
+            <!-- <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2> -->
+            <div style="margin-top: 20px;"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
         </div>
         <div class="col-lg-4" style="margin-top: 20px; text-align: right;">
             <button type="button" class="btn btn-default btn-sm" ui-sref="index.flightDept">Cancel</button>
@@ -36,7 +36,7 @@
                         <form role="form">
                             <div class="col-sm-6 b-r">
                                     <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
-                                    <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div>
+                                    <div class="form-group"><label>Email Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div>
                                     <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
                                     <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
                                     <!-- <div>
diff --git a/app/views/fbo-flight/flightDept.controller.js b/app/views/fbo-flight/flightDept.controller.js
index 7775786..c023385 100644
--- a/app/views/fbo-flight/flightDept.controller.js
+++ b/app/views/fbo-flight/flightDept.controller.js
@@ -4,11 +4,6 @@
   angular.module('acuefuel')
 
 	.controller('FlightDeptController', function ($scope, $uibModal, FBOFlight) {
-      $scope.showCompany = true;
-      $scope.editName = function(){
-        $scope.showCompany = false;
-
-      }
       $scope.data = {};
       $scope.user = {};
       $scope.aircraft = {};
@@ -110,7 +105,7 @@
           toastr.error('Please Add Contact Information', {
             closeButton: true
           })
-          $('#myModal4').modal('show');
+          $('#myModal4').modal('hide');
         }else{
           $('#myModal4').modal('show');
         }
diff --git a/app/views/updateAllFBO/updateAllFBO.controller.js b/app/views/updateAllFBO/updateAllFBO.controller.js
index 55640d7..13be230 100644
--- a/app/views/updateAllFBO/updateAllFBO.controller.js
+++ b/app/views/updateAllFBO/updateAllFBO.controller.js
@@ -11,11 +11,7 @@
           });
 
       });
-      $scope.showCompany = true;
-      $scope.editName = function(){
-        $scope.showCompany = false;
-
-      }
+      
       $scope.feature = {};
       var userProfileID = $stateParams.id;
       UpdateAllFBO.getALlFBOData(userProfileID).then(function(result) {
diff --git a/app/views/updateAllFBO/updateAllFBO.html b/app/views/updateAllFBO/updateAllFBO.html
index 7fb621e..dbf9ee3 100644
--- a/app/views/updateAllFBO/updateAllFBO.html
+++ b/app/views/updateAllFBO/updateAllFBO.html
@@ -1,8 +1,8 @@
 </div>
     <div class="row wrapper border-bottom white-bg page-heading">
         <div class="col-lg-3">
-            <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">{{user.companyName}}</h2>
-            <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
+            <!-- <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">{{user.companyName}}</h2> -->
+            <div style="margin-top: 20px;"><input type="text" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
         </div>
         <div class="col-lg-3" style="margin-top: 20px;">
             <button type="button" class="btn btn-w-m btn-danger" ng-click="deleteData()">Delete Account</button>
@@ -39,7 +39,7 @@
                         <form role="form">
                             <div class="col-sm-6 b-r">
                                     <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
-                                    <!-- <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div> -->
+                                    <!-- <div class="form-group"><label>Email Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div> -->
                                     <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
                                     <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
                                     <!-- <div>
diff --git a/app/views/updateFBODept/updateFBODept.controller.js b/app/views/updateFBODept/updateFBODept.controller.js
index bf8fa2b..866ebeb 100644
--- a/app/views/updateFBODept/updateFBODept.controller.js
+++ b/app/views/updateFBODept/updateFBODept.controller.js
@@ -4,11 +4,7 @@
   angular.module('acuefuel')
 
 	.controller('updateFBODeptController', function($scope, $stateParams, UpdateAllFBODept, UpdateAllFBO, FBOFlight) {
-      $scope.showCompany = true;
-      $scope.editName = function(){
-        $scope.showCompany = false;
-
-      }
+      
       $scope.showPayments = true;
       $scope.aircraft = {};
       $scope.updateData = {};
diff --git a/app/views/updateFBODept/updateFBODept.html b/app/views/updateFBODept/updateFBODept.html
index d5e9f0b..8b3c124 100644
--- a/app/views/updateFBODept/updateFBODept.html
+++ b/app/views/updateFBODept/updateFBODept.html
@@ -1,8 +1,8 @@
 
 <div class="row wrapper border-bottom white-bg page-heading">
      <div class="col-lg-3">
-        <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">{{user.companyName}}</h2>
-        <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
+        <!-- <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">{{user.companyName}}</h2> -->
+        <div style="margin-top: 20px;"><input type="text" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
     </div>
     <div class="col-lg-3" style="margin-top: 20px;">
         <button type="button" class="btn btn-w-m btn-danger" ng-click="deleteData()">Delete Account</button>
@@ -38,7 +38,7 @@
                         <form role="form">
                             <div class="col-sm-6 b-r">
                                     <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
-                                    <!-- <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div> -->
+                                    <!-- <div class="form-group"><label>Email Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div> -->
                                     <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
                                     <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
                                     <!-- <div>