diff --git a/.gitignore b/.gitignore
index 5e2c5cb..55d02be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-node_modules
 node
 logs/
 *.log
diff --git a/public/js/controllers.js b/public/js/controllers.js
index 5341a50..3ae17cf 100644
--- a/public/js/controllers.js
+++ b/public/js/controllers.js
@@ -347,10 +347,12 @@ biomed.ClientEditCtrl = function($scope, $routeParams, Clients) {
 	}
 
 	$scope.toggleFrequency = function(frequency, month) {
-		$scope.master.frequencies[frequency][month] =! $scope.master.frequencies[frequency][month];
-		Clients.update({id: $scope.master._id}, $scope.master, function() {
-			updatePms();
-		});
+		if (accountHasPermission('system.edit')) {
+			$scope.master.frequencies[frequency][month] =! $scope.master.frequencies[frequency][month];
+			Clients.update({id: $scope.master._id}, $scope.master, function() {
+				updatePms();
+			});
+		}
 	}
 };
 
diff --git a/public/partials/clients/edit.html b/public/partials/clients/edit.html
index 40146a5..7f32cae 100644
--- a/public/partials/clients/edit.html
+++ b/public/partials/clients/edit.html
@@ -6,8 +6,8 @@
 <header ng-hide="loading">
 	<h1>{{master.name}}</h1>
 	<p class="lead">{{master.identifier}}</p>
-	<a class="btn btn-primary" href="/workorders/add?clientId={{master._id}}">Create new Workorder</a>
-	<a class="btn" href="/workorders/add?workorderType=meeting&clientId={{master._id}}">Create new Meeting</a>
+	<a class="btn btn-primary" href="/workorders/add?clientId={{master._id}}" ng-show="accountHasPermission('system.edit')">Create new Workorder</a>
+	<a class="btn" href="/workorders/add?workorderType=meeting&clientId={{master._id}}" ng-show="accountHasPermission('system.edit')">Create new Meeting</a>
 </header>
 <div ng-hide="loading" class="tabbable">
 	<div class="tab-content">
@@ -18,7 +18,7 @@
 					<div ng-hide="identification.visible" class="form-preview">
 						{{master.name}}<br>
 						{{master.identifier}}<br>
-						<a ng-click="identification.edit()" ng-class="{disabled: editing}">Edit</a>
+						<a ng-click="identification.edit()" ng-class="{disabled: editing}" ng-show="accountHasPermission('system.edit')">Edit</a>
 					</div>
 					<div ng-form="identificationForm" ng-show="identification.visible" class="form-editor">
 						<div ng-class="{error: identificationForm.name.$invalid}" class="control-group">
@@ -49,7 +49,7 @@
 						{{master.address.street1}}<br>
 						{{master.address.street2}}<br ng-show="master.address.street2">
 						{{master.address.city}}, {{master.address.state}}. {{master.address.zip}}<br>
-						<a ng-click="address.edit()" ng-class="{disabled: editing}">Edit</a>
+						<a ng-click="address.edit()" ng-class="{disabled: editing}" ng-show="accountHasPermission('system.edit')">Edit</a>
 					</div>
 					<div ng-form="addressForm" ng-show="address.visible" class="form-editor">
 						<div ng-class="{error: addressForm.street1.$invalid}" class="control-group">
@@ -152,7 +152,7 @@
 						{{master.contacts[0].name}}<br ng-show="master.contacts[0].name">
 						{{master.contacts[0].phone}}<br ng-show="master.contacts[0].phone">
 						<a href="mailto:{{master.contacts[0].email}}">{{master.contacts[0].email}}</a><br ng-show="master.contacts[0].email">
-						<a ng-click="primaryContact.edit()" ng-class="{disabled: editing}">Edit</a>
+						<a ng-click="primaryContact.edit()" ng-class="{disabled: editing}" ng-show="accountHasPermission('system.edit')">Edit</a>
 					</div>
 					<div ng-show="primaryContact.visible" class="form-editor">
 						<div class="control-group">
@@ -187,7 +187,7 @@
 						{{master.contacts[1].name}}<br ng-show="master.contacts[1].name">
 						{{master.contacts[1].phone}}<br ng-show="master.contacts[1].phone">
 						{{master.contacts[1].email}}<br ng-show="master.contacts[1].email">
-						<a ng-click="secondaryContact.edit()" ng-class="{disabled: editing}">Edit</a>
+						<a ng-click="secondaryContact.edit()" ng-class="{disabled: editing}" ng-show="accountHasPermission('system.edit')">Edit</a>
 					</div>
 					<div ng-show="secondaryContact.visible" class="form-editor">
 						<div class="control-group">
@@ -330,7 +330,7 @@
 				<div class="section-container">
 					<div ng-hide="internalNotes.visible" class="form-preview">
 						{{master.notes.internal}}<br ng-show="master.notes.internal">
-						<a ng-click="internalNotes.edit()" ng-class="{disabled: editing}">Edit</a>
+						<a ng-click="internalNotes.edit()" ng-class="{disabled: editing}" ng-show="accountHasPermission('system.edit')">Edit</a>
 					</div>
 					<div ng-show="internalNotes.visible" class="form-editor">
 						<div class="control-group">
@@ -352,7 +352,7 @@
 				<div class="section-container">
 					<div ng-hide="techNotes.visible" class="form-preview">
 						{{master.notes.tech}}<br ng-show="master.notes.tech">
-						<a ng-click="techNotes.edit()" ng-class="{disabled: editing}">Edit</a>
+						<a ng-click="techNotes.edit()" ng-class="{disabled: editing}" ng-show="accountHasPermission('system.edit')">Edit</a>
 					</div>
 					<div ng-show="techNotes.visible" class="form-editor">
 						<div class="control-group">
diff --git a/public/partials/clients/index.html b/public/partials/clients/index.html
index d0f92e0..6318f2a 100644
--- a/public/partials/clients/index.html
+++ b/public/partials/clients/index.html
@@ -8,7 +8,7 @@
 <div class="row-fluid">
 	<div class="span12">
 		<div class="toolbelt">
-			<a href="/clients/add" class="btn btn-primary">Create new Client</a>
+			<a href="/clients/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Create new Client</a>
 			<div class="pull-right">
 				<span class="toolbelt-text">Search:</span>
 	            <div class="input-append">
@@ -38,4 +38,4 @@
 			</tbody>
 		</table>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/public/partials/schedule/index.html b/public/partials/schedule/index.html
index 0be5909..efd191a 100644
--- a/public/partials/schedule/index.html
+++ b/public/partials/schedule/index.html
@@ -8,8 +8,8 @@
 <div class="row-fluid">
 	<div class="span12">
 		<div class="toolbelt">
-			<a href="/workorders/add" class="btn btn-primary">Create new Workorder</a>
-			<a href="/workorders/add?workorderType=meeting" class="btn">Create new Meeting</a>
+			<a href="/workorders/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Create new Workorder</a>
+			<a href="/workorders/add?workorderType=meeting" class="btn" ng-show="accountHasPermission('system.edit')">Create new Meeting</a>
 			<a href="/schedule/pms" class="btn">View PMs</a>
 			<div class="pull-right">
 	            <span class="toolbelt-text">Group: </span>
diff --git a/public/partials/schedule/pms.html b/public/partials/schedule/pms.html
index 197bc99..84a8a5f 100644
--- a/public/partials/schedule/pms.html
+++ b/public/partials/schedule/pms.html
@@ -8,7 +8,7 @@
 <div class="row-fluid">
 	<div class="span12">
 		<div class="toolbelt">
-			<a href="/clients/add" class="btn btn-primary">Create new Workorder</a>
+			<a href="/clients/add" class="btn btn-primary"  ng-show="accountHasPermission('system.edit')">Create new Workorder</a>
 			<div class="pull-right">
 				<span class="toolbelt-text">Month:</span>
 	            <div class="input-append">
diff --git a/public/partials/users/index.html b/public/partials/users/index.html
index bec6ae2..d742cea 100644
--- a/public/partials/users/index.html
+++ b/public/partials/users/index.html
@@ -21,7 +21,7 @@
 				<tr>
 					<th colspan="2"></th>
 					<th colspan="5">Groups</th>
-					<th colspan="4">Permissions</th>
+					<th colspan="5">Permissions</th>
 				</tr>
 				<tr>
 					<th style="width: 15%">Name</th>
@@ -34,6 +34,7 @@
 					<th style="width: 5%" class="group-start">Portal</th>
 					<th style="width: 5%">Tags</th>
 					<th style="width: 5%">Messages</th>
+					<th style="width: 5%">Edit</th>
 					<th style="width: 5%">Admin</th>
 				</tr>
 			</thead>
@@ -52,8 +53,8 @@
 					<td class="group-start {{ checkPerm(user, 'system.login') }}"><a ng-click="togglePerm(user, 'system.login')"><i ng-class="{ 'icon-ok': checkPerm(user, 'system.login'), 'icon-remove': !checkPerm(user, 'system.login')}"></i></a></td>
 					<td class="{{ checkPerm(user, 'system.tags') }}"><a ng-click="togglePerm(user, 'system.tags')"><i ng-class="{ 'icon-ok': checkPerm(user, 'system.tags'), 'icon-remove': !checkPerm(user, 'system.tags')}"></i></a></td>
 					<td class="{{ checkPerm(user, 'messages.receive') }}"><a ng-click="togglePerm(user, 'messages.receive')"><i ng-class="{ 'icon-ok': checkPerm(user, 'messages.receive'), 'icon-remove': !checkPerm(user, 'messages.receive')}"></i></a></td>
+					<td class="{{ checkPerm(user, 'system.edit') }}"><a ng-click="togglePerm(user, 'system.edit')"><i ng-class="{ 'icon-ok': checkPerm(user, 'system.edit'), 'icon-remove': !checkPerm(user, 'system.edit')}"></i></a></td>
 					<td class="{{ checkPerm(user, 'system.admin') }}"><a ng-click="togglePerm(user, 'system.admin')"><i ng-class="{ 'icon-ok': checkPerm(user, 'system.admin'), 'icon-remove': !checkPerm(user, 'system.admin')}"></i></a></td>
-
 				</tr>
 			</tbody>
 		</table>
diff --git a/public/partials/workorders/edit.html b/public/partials/workorders/edit.html
index a91ba94..5c19495 100644
--- a/public/partials/workorders/edit.html
+++ b/public/partials/workorders/edit.html
@@ -17,7 +17,7 @@
 				<div class="section-container">
 					<div ng-hide="status.visible" class="form-preview">
 						{{master.status}}<br>
-						<a ng-click="status.edit()" ng-class="{disabled: editing}">Edit</a>
+						<a ng-click="status.edit()" ng-class="{disabled: editing}" ng-show="accountHasPermission('system.edit')">Edit</a>
 					</div>
 					<div ng-show="status.visible" class="form-editor">
 						<div class="control-group">
@@ -46,7 +46,7 @@
                                 <div class="section-container">
                                         <div ng-hide="emails.visible" class="form-preview">
 						<span ng-repeat="email in master.emails"><b>{{email}}</b><span ng-show="!$last">, </span></span>
-                                                <a ng-click="emails.edit()" ng-class="{disabled: editing}">Edit</a>
+                                                <a ng-click="emails.edit()" ng-class="{disabled: editing}" ng-show="accountHasPermission('system.edit')">Edit</a>
                                         </div>
                                         <div ng-show="emails.visible" class="form-editor">
                                                 <div class="control-group">
@@ -70,7 +70,7 @@
 					<div ng-hide="remarks.visible" class="form-preview">
 						{{master.reason}}<br>
 						{{master.remarks}}<br>
-						<a ng-click="remarks.edit()" ng-class="{disabled: editing}">Edit</a>
+						<a ng-click="remarks.edit()" ng-class="{disabled: editing}" ng-show="accountHasPermission('system.edit')">Edit</a>
 					</div>
 					<div ng-show="remarks.visible" class="form-editor">
 						<div class="control-group">
@@ -139,7 +139,7 @@
 					<div ng-hide="scheduling.visible" class="form-preview">
 						From <strong>{{master.scheduling.start | date}} {{master.scheduling.start | time}}</strong> to <strong>{{master.scheduling.end | date}} {{master.scheduling.end | time}}</strong><br>
 						<span ng-show="workorderType != 'meeting'">Techs</span><span ng-show="workorderType == 'meeting'">Attendees</span>: <strong>{{ master.techs | techs }}</strong><br>
-						<a ng-click="scheduling.edit()">Edit</a>
+						<a ng-click="scheduling.edit()" ng-show="accountHasPermission('system.edit')">Edit</a>
 					</div>
 					<div ng-show="scheduling.visible" class="form-editor">
 						<div class="control-group">
diff --git a/public/partials/workorders/index.html b/public/partials/workorders/index.html
index 1c30293..52174f3 100644
--- a/public/partials/workorders/index.html
+++ b/public/partials/workorders/index.html
@@ -6,8 +6,8 @@
 <div class="row-fluid">
 	<div class="span12">
     	<div class="toolbelt">
-		<a href="/workorders/add" class="btn btn-primary">Create new workorder</a>
-		<a href="/workorders/add?workorderType=meeting" class="btn">Create new meeting</a>	
+		<a href="/workorders/add" class="btn btn-primary" ng-show="accountHasPermission('system.edit')">Create new workorder</a>
+		<a href="/workorders/add?workorderType=meeting" class="btn" ng-show="accountHasPermission('system.edit')">Create new meeting</a>	
     		<div class="pull-right">
 	            <div class="input-append">
 	                <input type="text" ng-model="query" class="input-large" placeholder="Search">