diff --git a/app/views/clients/edit.blade.php b/app/views/clients/edit.blade.php
index 1e5dd9a324..a8bab7065a 100755
--- a/app/views/clients/edit.blade.php
+++ b/app/views/clients/edit.blade.php
@@ -48,7 +48,7 @@
 				{{ Former::hidden('public_id')->data_bind("value: public_id, valueUpdate: 'afterkeydown'") }}
 				{{ Former::text('first_name')->data_bind("value: first_name, valueUpdate: 'afterkeydown'") }}
 				{{ Former::text('last_name')->data_bind("value: last_name, valueUpdate: 'afterkeydown'") }}
-				{{ Former::text('email')->data_bind("value: email, valueUpdate: 'afterkeydown'") }}
+				{{ Former::text('email')->data_bind('value: email, valueUpdate: \'afterkeydown\', attr: {id:\'email\'+$index()}') }}
 				{{ Former::text('phone')->data_bind("value: phone, valueUpdate: 'afterkeydown'") }}	
 
 				<div class="form-group">
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index a9b7d5649d..d9cbd64c3e 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -312,7 +312,7 @@
 					{{ Former::hidden('public_id')->data_bind("value: public_id, valueUpdate: 'afterkeydown'") }}
 					{{ Former::text('first_name')->data_bind("value: first_name, valueUpdate: 'afterkeydown'") }}
 					{{ Former::text('last_name')->data_bind("value: last_name, valueUpdate: 'afterkeydown'") }}
-					{{ Former::text('email')->data_bind("value: email, valueUpdate: 'afterkeydown'") }}
+					{{ Former::text('email')->data_bind('value: email, valueUpdate: \'afterkeydown\', attr: {id:\'email\'+$index()}') }}
 					{{ Former::text('phone')->data_bind("value: phone, valueUpdate: 'afterkeydown'") }}	
 
 					<div class="form-group">
@@ -823,7 +823,7 @@
 		self.clientFormComplete = function() {
 
 			var isValid = true;
-			$("input[id='email']").each(function(item, value) {
+			$("input[name='email']").each(function(item, value) {
 				var email = $(value).val();
 				if (!email || !isValidEmailAddress(email)) {
 					isValid = false;					
@@ -834,7 +834,7 @@
 				return;
 			}
 
-			var email = $('#email').val();
+			var email = $('#email0').val();
 			var firstName = $('#first_name').val();
 			var lastName = $('#last_name').val();
 			var name = $('#name').val();
diff --git a/composer.json b/composer.json
index 93a5dc2ea1..3b02729eb5 100755
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
 		"intervention/image": "dev-master",
 		"webpatser/laravel-countries": "dev-master",
 		"anahkiasen/rocketeer": "dev-develop",
-		"codeception/codeception": "*"
+		"codeception/codeception": "dev-master"
 	},
 	"autoload": {
 		"classmap": [
diff --git a/public/css/style.css b/public/css/style.css
index 92a198e721..4c6dd46c18 100755
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -226,4 +226,4 @@ body {
     .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
         color: #ffffff;
     }
-}
\ No newline at end of file
+}