diff --git a/pkg/web/components/assignee_form.templ b/pkg/web/components/assignee_form.templ
index e67032c..89f9cc2 100644
--- a/pkg/web/components/assignee_form.templ
+++ b/pkg/web/components/assignee_form.templ
@@ -12,12 +12,27 @@ templ AssigneeForm(props AssigneeFormProps) {
 		hx-patch={ props.PatchAction }
 		hx-swap="innerHTML"
 	>
-		@base.Input(base.InputProps{
-			Name:        "assignee",
-			Type:        "text",
-			Placeholder: "Enter assingee",
-			Value:       props.Assignee,
-		})
-		<button class="btn btn-primary mt-2" type="submit">Set Assignee</button>
+		<div class="form-control">
+			<label class="label cursor-pointer justify-start gap-2">
+				<input
+					type="checkbox"
+					name="assign_me"
+					value="me"
+					class="checkbox checkbox-primary"
+					if props.Assignee == "Me" {
+						checked
+					}
+				/>
+				<span class="label-text">Assign this issue to me</span>
+			</label>
+			if props.Assignee != "" {
+				<p class="text-xs mt-1 opacity-70">
+					Current assignee: { props.Assignee }
+				</p>
+			}
+		</div>
+		<button class="btn btn-primary mt-4" type="submit">
+			Update Assignee
+		</button>
 	</form>
 }
diff --git a/pkg/web/handler/issues.go b/pkg/web/handler/issues.go
index 3f48bc1..dbcaa94 100644
--- a/pkg/web/handler/issues.go
+++ b/pkg/web/handler/issues.go
@@ -196,7 +196,12 @@ func UpdateIssue(w http.ResponseWriter, r *http.Request) {
 
 func UpdateAssignee(w http.ResponseWriter, r *http.Request) {
 	issue := r.Context().Value(issueKey).(*models.Issue)
-	assignee := r.FormValue("assignee")
+	assignMe := r.FormValue("assign_me")
+
+	assignee := ""
+	if assignMe != "" {
+		assignee = "Me"
+	}
 
 	if err := App(r).Issues.UpdateIssue(r.Context(), issue.ID, map[string]any{"assignee": assignee}, ""); err != nil {
 		http.Error(w, "Failed to update assignee", http.StatusInternalServerError)