diff --git a/Yavsc/Views/Estimate/Create.cshtml b/Yavsc/Views/Estimate/Create.cshtml
index caf8a9aa..03bbe9d7 100644
--- a/Yavsc/Views/Estimate/Create.cshtml
+++ b/Yavsc/Views/Estimate/Create.cshtml
@@ -11,6 +11,28 @@
         <h4>Estimate</h4>
         <hr />
         <div asp-validation-summary="ValidationSummary.ModelOnly" class="text-danger"></div>
+        <div class="form-group">
+            <label asp-for="ClientId" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <select name="ClientId" id="ClientId">
+                    @foreach (var client in ViewBag.Clients) {
+                    <option value="@client.Id">@client.UserName</option>
+                    }
+                </select>
+                <span asp-validation-for="ClientId" class="text-danger" />
+            </div>
+        </div>
+                <div class="form-group">
+            <label asp-for="CommandId" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <select name="CommandId" id="CommandId">
+                    @foreach (var query in ViewBag.Queries) {
+                    <option value="@query.Id" data-clientid="@query.ClientId">@query.GetDescription()</option>
+                    }
+                </select>
+                <span asp-validation-for="ClientId" class="text-danger" />
+            </div>
+        </div>
         <div class="form-group">
             <label asp-for="Description" class="col-md-2 control-label"></label>
             <div class="col-md-10">