diff --git a/asset/forms.py b/asset/forms.py
index 652ebb33c..3ba01b964 100644
--- a/asset/forms.py
+++ b/asset/forms.py
@@ -55,7 +55,7 @@ class AssetForm(ModelForm):
 
         model = Asset
         fields = "__all__"
-        exclude = ["is_active"]
+        exclude = ["is_active,owner"]
         widgets = {
             "asset_name": forms.TextInput(
                 attrs={"placeholder": "Macbook Pro.", "class": "oh-input w-100"}
@@ -159,6 +159,7 @@ class DocumentForm(forms.ModelForm):
                 "type": "File",
                 "class": "form-control",
                 "multiple": "True",
+                "accept": ".jpeg, .jpg, .png, .pdf",
             }
         )
     )
diff --git a/asset/templates/asset/asset_update.html b/asset/templates/asset/asset_update.html
index 10291c690..0e498f84f 100644
--- a/asset/templates/asset/asset_update.html
+++ b/asset/templates/asset/asset_update.html
@@ -96,13 +96,16 @@
                     {{asset_form.asset_name.errors}}
                   </div>
                 </div>
-                <div class="col-12 col-sm-12 col-md-6 col-lg-6">
-                  <div class="oh-input__group">
-                    <label class="oh-input__label" for="{{asset_form.owner.id_for_label}}" >{% trans "Owner" %}</label>
-                    {{asset_form.owner }}
-                    {{asset_form.owner.errors }}
+                {% if instance.asset_status == "In use" and instance.assetassignment_set.last %}
+                  <div class="col-12 col-sm-12 col-md-6 col-lg-6">
+                    <div class="oh-input__group">
+                      <label class="oh-input__label" for="{{asset_form.owner.id_for_label}}">{% trans "Current User" %}</label>
+                      {% with assigned=instance.assetassignment_set.last %}
+                        <input type="text" class="oh-input w-100" value="{{ assigned.assigned_to_employee_id }}" readonly>
+                      {% endwith %}
+                    </div>
                   </div>
-                </div>
+                {% endif %}
               </div>
               <div class="oh-input__group ">
                 <label class="oh-input__label" for="{{asset_form.asset_description.id_for_label}}" >{% trans "Asset Description" %}</label>
diff --git a/asset/views.py b/asset/views.py
index 3ab1424ca..6cd2eb041 100644
--- a/asset/views.py
+++ b/asset/views.py
@@ -196,6 +196,7 @@ def asset_update(request, asset_id):
             asset_form.save()
             messages.success(request, _("Asset Updated"))
     context = {
+        "instance": instance,
         "asset_form": asset_form,
         "asset_under": asset_under,
         "pg": previous_data,