diff --git a/app/config/version.php b/app/config/version.php
index 9b0f5240c5..6a981ba2cb 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
   'app_version' => 'v2.0-pre',
-  'hash_version' => 'v2.0-pre-beta-4-g15e1774',
+  'hash_version' => 'v2.0-pre-beta-5-g1c2a409',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 30640b23a2..2b5f6e5f5f 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -223,11 +223,12 @@ class AssetsController extends AdminController
 		->lists('name', 'id');
         $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')->lists('name', 'id');
         $location_list = array('' => Lang::get('general.select_location')) + Location::orderBy('name', 'asc')->lists('name', 'id');
+        $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
 
         // Grab the dropdown list of status
         $statuslabel_list = Statuslabel::orderBy('name', 'asc')->lists('name', 'id');
 
-        return View::make('backend/hardware/edit', compact('asset'))->with('model_list',$model_list)->with('supplier_list',$supplier_list)->with('location_list',$location_list)->with('statuslabel_list',$statuslabel_list);
+        return View::make('backend/hardware/edit', compact('asset'))->with('model_list',$model_list)->with('supplier_list',$supplier_list)->with('location_list',$location_list)->with('statuslabel_list',$statuslabel_list)->with('assigned_to',$assigned_to);
     }
 
 
@@ -1060,7 +1061,7 @@ class AssetsController extends AdminController
       	{
 
             if ($assets->assetstatus) {
-                
+
                 if ($assets->assetstatus->deployable != 0) {
                     if (($assets->assigned_to !='') && ($assets->assigned_to > 0)) {
                         return '<a href="'.route('checkin/hardware', $assets->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
diff --git a/app/routes.php b/app/routes.php
index 1cb043fe21..74f56b02b5 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -16,7 +16,9 @@ Route::group(array('prefix' => 'api', 'namespace' => 'Controllers\Admin', 'befor
         Route::get('{statuslabelId}/deployable', function ($statuslabelId) {
 			 $statuslabel = Statuslabel::find($statuslabelId);
              if (($statuslabel->deployable=='1') && ($statuslabel->pending!='1') && ($statuslabel->archived!='1')) {
-                 return $statuslabel->deployable;
+                 return '1';
+             } else {
+                 return '0';
              }
 		});
     });
diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php
index 50ad77fbe7..104ee15730 100755
--- a/app/views/backend/hardware/edit.blade.php
+++ b/app/views/backend/hardware/edit.blade.php
@@ -166,7 +166,9 @@
                 <label for="status_id" class="col-md-2 control-label">@lang('admin/hardware/form.status') <i class='fa fa-asterisk'></i></label>
                     <div class="col-md-7 col-sm-12 col-sm-12">
                         {{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2 status_id', 'style'=>'width:350px')) }}
+
                         <span class="status_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
+
                         <p class="help-block">@lang('admin/hardware/form.help_checkout')</p>
                         {{ $errors->first('status_id', '<br><span class="alert-msg"><i class="fa fa-times"></i> :message</span>') }}
                     </div>
@@ -228,60 +230,68 @@
 </div>
 <script>
 
-	var $eventSelect = $(".model");
-	$eventSelect.on("change", function () {
-        $(".mac_spinner").css("display", "inline");
-        mac_add($eventSelect.val());
+    $(function() {
+        mac_add($(".model option:selected").val());
     });
-	$(function() {
-        var mac = $(".model option:selected").val();
-        if(mac!=''){
-	       mac_add(mac);
+
+	var $modelSelect = $(".model");
+	$modelSelect.on("change", function () {
+        mac_add($modelSelect.val());
+    });
+
+	function mac_add(assetmodel_id) {
+        if(assetmodel_id!=''){
+            $(".mac_spinner").css("display", "inline");
+    	    $.ajax({
+    	        url: "{{Config::get('app.url')}}/api/models/"+assetmodel_id+"/check",
+    	        success: function(data) {
+                    $(".mac_spinner").css("display", "none");
+
+    	            if(data == true){
+    	                 $("#mac_address").css("display", "block");
+    	            } else {
+    	                 $("#mac_address").css("display", "none");
+    	            }
+    	        }
+    	    });
         }
-	});
-	function mac_add(id) {
-	    $.ajax({
-	        url: "{{Config::get('app.url')}}/api/models/"+id+"/check",
-	        success: function(data) {
-                $(".mac_spinner").css("display", "none");
-                
-	            if(data == true){
-	                 $("#mac_address").css("display", "block");
-	            } else {
-	                 $("#mac_address").css("display", "none");
-	            }
-	        }
-	    });
 	};
 
 
-    var $eventSelect = $(".status_id");
-	$eventSelect.on("change", function () {
-        $(".status_spinner").css("display", "inline");
-        user_add($eventSelect.val());
+
+
+    $(function() {
+        user_add($(".status_id option:selected").val());
     });
-	$(function() {
-        var deployable = $(".status_id option:selected").val();
 
-        if(deployable!=''){
-	       user_add(deployable);
+	var $statusSelect = $(".status_id");
+	$statusSelect.on("change", function () {
+        user_add($statusSelect.val());
+    });
+
+	function user_add(status_id) {
+        console.log(status_id);
+
+        if(status_id!=''){
+            $(".status_spinner").css("display", "inline");
+    	    $.ajax({
+    	        url: "{{Config::get('app.url')}}/api/statuslabels/"+status_id+"/deployable",
+    	        success: function(data) {
+                    console.log(data);
+                    $(".status_spinner").css("display", "none");
+
+    	            if(data == true){
+    	                 $("#assigned_user").css("display", "block");
+    	            } else {
+    	                 $("#assigned_user").css("display", "none");
+    	            }
+    	        }
+    	    });
         }
-	});
-
-	function user_add(id) {
-	    $.ajax({
-	        url: "{{Config::get('app.url')}}/api/statuslabels/"+id+"/deployable",
-	        success: function(data) {
-                $(".status_spinner").css("display", "none");
-	            if(data == true){
-	                 $("#assigned_user").css("display", "block");
-	            } else {
-	                 $("#assigned_user").css("display", "none");
-                     $("#assigned_to").val('');
-	            }
-	        }
-	    });
 	};
+
+
+
 </script>
 
 @stop