diff --git a/vedia.rb b/vedia.rb
index 22b6b61..63d1142 100644
--- a/vedia.rb
+++ b/vedia.rb
@@ -333,6 +333,30 @@ post '/votes/:id/candidates' do
   redirect '/votes/' + @vote.secure_id
 end
 
+get '/votes/:id/candidates/:cid' do
+  require_login
+  find_vote
+  require_organizer
+  require_draft_vote
+  find_candidate
+  require_candidate_in_vote
+  erb :candidates_edit
+end
+
+post '/votes/:id/candidates/:cid' do
+  require_login
+  find_vote
+  require_organizer
+  require_draft_vote
+  find_candidate
+  require_candidate_in_vote
+  @candidate.name = params[:name]
+  @candidate.description = params[:description]
+  @candidate.save
+  redirect '/votes/' + @vote.secure_id
+  erb :candidates_edit
+end
+
 post '/votes/:id/candidates/:cid/delete' do
   require_login
   find_vote
diff --git a/views/candidates_edit.erb b/views/candidates_edit.erb
new file mode 100644
index 0000000..16b62d7
--- /dev/null
+++ b/views/candidates_edit.erb
@@ -0,0 +1,13 @@
+<h1 class="mb-5"><%= _("Edit candidate") %></h1>
+
+<form action="/votes/<%= @vote.secure_id %>/candidates/<%= @candidate.id %>" method="post">
+  <div class="mb-3">
+    <label for="name" class="form-label"><%= _("Name") %></label>
+    <input type="text" name="name" value="<%= @candidate.name %>" class="form-control">
+  </div>
+  <div class="mb-3">
+    <label for="description" class="form-label"><%= _("Description") %></label>
+    <textarea type="text" name="description" class="form-control"><%= @candidate.description %></textarea>
+  </div>
+  <button type="submit" class="btn btn-primary"><%= _("Save") %></button>
+</form>
diff --git a/views/votes_edit.erb b/views/votes_edit.erb
index 03073a5..89585f0 100644
--- a/views/votes_edit.erb
+++ b/views/votes_edit.erb
@@ -24,6 +24,9 @@
     <div class="card-body">
       <h3 class="mb-3"><%= candidate.name %></h3>
       <%= markdown(candidate.description) %>
+      <form action="/votes/<%= @vote.secure_id %>/candidates/<%= candidate.id %>" method="get" class="mb-3">
+        <button type="submit" class="btn btn-outline-primary"><%= _("Edit") %></button>
+      </form>
       <form action="/votes/<%= @vote.secure_id %>/candidates/<%= candidate.id %>/delete" method="post">
         <button type="submit" class="btn btn-outline-danger"><%= _("Delete") %></button>
       </form>