diff --git a/Foundation.hs b/Foundation.hs
index b97e5c7..f44c2eb 100644
--- a/Foundation.hs
+++ b/Foundation.hs
@@ -120,6 +120,7 @@ instance Yesod App where
 
     isAuthorized TagsR _ = return Authorized
     isAuthorized AchievementsR _ = return Authorized
+    isAuthorized (EditAchievementR _) _ = isAdmin
 
     isAuthorized (ShowChallengeR _) _ = return Authorized
     isAuthorized (ChallengeReadmeR _) _ = return Authorized
diff --git a/Handler/Achievements.hs b/Handler/Achievements.hs
index 20ccd33..d65e06f 100644
--- a/Handler/Achievements.hs
+++ b/Handler/Achievements.hs
@@ -20,13 +20,13 @@ import qualified Yesod.Table as Table
 
 getAchievementsR :: Handler Html
 getAchievementsR = do
-  (formWidget, formEnctype) <- generateFormPost achievementForm
+  (formWidget, formEnctype) <- generateFormPost (achievementForm Nothing Nothing)
   mUser <- maybeAuth
   doAchievements mUser formWidget formEnctype
 
 postAchievementsR :: Handler Html
 postAchievementsR = do
-  ((result, formWidget), formEnctype) <- runFormPost achievementForm
+  ((result, formWidget), formEnctype) <- runFormPost (achievementForm Nothing Nothing)
   mUser <- maybeAuth
   when (checkIfAdmin mUser) $ do
      case result of
@@ -54,9 +54,9 @@ doAchievements mUser formWidget formEnctype = do
     setTitle "Achievements"
     $(widgetFile "achievements")
 
-achievementsTable :: Table.Table App (AchievementInfo)
-achievementsTable = mempty
-  ++ Table.text "achievement" achievementInfoName
+achievementsTable :: Bool -> Table.Table App (AchievementInfo)
+achievementsTable canEdit = mempty
+  ++ achievementNameEntry canEdit
   ++ Table.text "course" (courseName . entityVal . achievementInfoCourse)
   ++ Table.linked "challenge" (challengeTitle . entityVal . achievementInfoChallenge) (ShowChallengeR . challengeName . entityVal . achievementInfoChallenge)
   ++ achievementDescriptionCell id
@@ -65,6 +65,9 @@ achievementsTable = mempty
   ++ Table.string "max submitters" (formatMaxSubmitters . achievementInfoMaxWinners)
   ++ workingOnCell
 
+achievementNameEntry True = Table.linked "achievement" (achievementInfoName) (EditAchievementR . achievementInfoId)
+achievementNameEntry False = Table.text "achievement" achievementInfoName
+
 workingOnCell = Table.widget "who's working on it?" workingOnWidget
 
 workingOnWidget ainfo = [whamlet|
@@ -161,27 +164,76 @@ formatMaxSubmitters :: Maybe Int -> String
 formatMaxSubmitters Nothing = "no limit"
 formatMaxSubmitters (Just m) = show m
 
-achievementForm :: Form (Text, Maybe Text, Int, Day, TimeOfDay, Maybe Int, Maybe Text, ChallengeId, CourseId)
-achievementForm = renderBootstrap3 BootstrapBasicForm $ (,,,,,,,,)
-    <$> areq textField (bfs MsgAchievementName) Nothing
-    <*> aopt textField (bfs MsgAchievementDescription) Nothing
-    <*> areq intField (bfs MsgAchievementPoints) Nothing
-    <*> areq dayField (bfs MsgAchievementDeadlineDay) Nothing
-    <*> areq timeFieldTypeTime (bfs MsgAchievementDeadlineTime) Nothing
-    <*> aopt intField (bfs MsgAchievementMaxWinners) Nothing
-    <*> aopt textField (tagsfs MsgAchievementTags) Nothing
-    <*> challengesSelectFieldList
-    <*> coursesSelectFieldList
+achievementForm :: Maybe Achievement -> Maybe [Entity Tag] -> Form (Text, Maybe Text, Int, Day, TimeOfDay, Maybe Int, Maybe Text, ChallengeId, CourseId)
+achievementForm mAchievement mTags = renderBootstrap3 BootstrapBasicForm $ (,,,,,,,,)
+    <$> areq textField (bfs MsgAchievementName) (achievementName <$> mAchievement)
+    <*> aopt textField (bfs MsgAchievementDescription) (achievementDescription <$> mAchievement)
+    <*> areq intField (bfs MsgAchievementPoints) (achievementPoints <$> mAchievement)
+    <*> areq dayField (bfs MsgAchievementDeadlineDay) (utctDay <$> achievementDeadline <$> mAchievement)
+    <*> areq timeFieldTypeTime (bfs MsgAchievementDeadlineTime) (timeToTimeOfDay <$> utctDayTime <$> achievementDeadline <$> mAchievement)
+    <*> aopt intField (bfs MsgAchievementMaxWinners) (achievementMaxWinners <$> mAchievement)
+    <*> aopt textField (tagsfs MsgAchievementTags) (tagsToText <$> mTags)
+    <*> challengesSelectFieldList (achievementChallenge <$> mAchievement)
+    <*> coursesSelectFieldList (achievementCourse <$> mAchievement)
 
-challengesSelectFieldList = areq (selectField challenges) (bfs MsgChallenge) Nothing
+tagsToText [] = Nothing
+tagsToText tags = Just $ Data.Text.intercalate ", " $ Import.map (tagName . entityVal) tags
+
+challengesSelectFieldList mChallengeId = areq (selectField challenges) (bfs MsgChallenge) mChallengeId
     where
       challenges = do
         challengeEnts <- runDB $ selectList [] [Asc ChallengeTitle]
         optionsPairs $ Import.map (\ch -> (challengeTitle $ entityVal ch, entityKey ch)) challengeEnts
 
 
-coursesSelectFieldList = areq (selectField courses) (bfs MsgCourse) Nothing
+coursesSelectFieldList mCourseId = areq (selectField courses) (bfs MsgCourse) mCourseId
     where
       courses = do
         courseEnts <- runDB $ selectList [] [Asc CourseName]
         optionsPairs $ Import.map (\ch -> (courseName $ entityVal ch, entityKey ch)) courseEnts
+
+getEditAchievementR :: AchievementId -> Handler Html
+getEditAchievementR achievementId = do
+  tagsAvailableAsJSON <- runDB $ getAvailableTagsAsJSON
+  achievement <- runDB $ get404 achievementId
+  tags <- runDB $ getAchievementTags achievementId
+  (formWidget, formEnctype) <- generateFormPost (achievementForm (Just achievement) (Just tags))
+  mUser <- maybeAuth
+
+  defaultLayout $ do
+    setTitle "Edit achievements"
+    $(widgetFile "edit-achievement")
+
+postEditAchievementR :: AchievementId -> Handler Html
+postEditAchievementR achievementId = do
+  tagsAvailableAsJSON <- runDB $ getAvailableTagsAsJSON
+  achievement <- runDB $ get404 achievementId
+  ((result, formWidget), formEnctype) <- runFormPost (achievementForm Nothing Nothing)
+  mUser <- maybeAuth
+
+  when (checkIfAdmin mUser) $ do
+     case result of
+      FormSuccess (name, description, points, deadlineDay, deadlineTime, maxSubmitters, mTags, challengeId, courseId) -> do
+        runDB $ do
+          update achievementId [AchievementName =. name,
+                                AchievementDescription =. description,
+                                AchievementPoints =. points,
+                                AchievementDeadline =. UTCTime { utctDay = deadlineDay,
+                                                                 utctDayTime = timeOfDayToTime deadlineTime },
+                                AchievementMaxWinners =. maxSubmitters,
+                                AchievementChallenge =. challengeId,
+                                AchievementCourse =. courseId]
+
+          deleteWhere [AchievementTagAchievement ==. achievementId]
+          tids <- tagsAsTextToTagIds mTags
+          mapM (\tid -> insert $ AchievementTag achievementId tid) tids
+
+        setMessage $ toHtml ("OK! Achievement modified" :: Text)
+        return ()
+      _ -> do
+           return ()
+
+
+  defaultLayout $ do
+    setTitle "Edit achievements"
+    $(widgetFile "edit-achievement")
diff --git a/config/routes b/config/routes
index a00acf9..7f62cd3 100644
--- a/config/routes
+++ b/config/routes
@@ -35,6 +35,7 @@
 
 /tags TagsR GET POST
 /achievements AchievementsR GET POST
+/edit-achievement/#AchievementId EditAchievementR GET POST
 /start-working-on/#AchievementId StartWorkingOnR GET
 /give-up-working-on/#AchievementId GiveUpWorkingOnR GET
 /submission-for-achievement/#SubmissionId/#WorkingOnId SubmissionForAchievementR GET
diff --git a/templates/achievements.hamlet b/templates/achievements.hamlet
index 0dadfa5..e10f4ee 100644
--- a/templates/achievements.hamlet
+++ b/templates/achievements.hamlet
@@ -1,6 +1,6 @@
 <h1>Achievements
 
-^{Table.buildBootstrap achievementsTable achievementInfos}
+^{Table.buildBootstrap (achievementsTable (checkIfAdmin mUser)) achievementInfos}
 
 <hr>
 
diff --git a/templates/edit-achievement.hamlet b/templates/edit-achievement.hamlet
new file mode 100644
index 0000000..ff49993
--- /dev/null
+++ b/templates/edit-achievement.hamlet
@@ -0,0 +1,4 @@
+<form method=post action=@{EditAchievementR achievementId}#form enctype=#{formEnctype}>
+  ^{formWidget}
+  <button .btn .btn-primary type="submit">
+    _{MsgSubmit} <span class="glyphicon glyphicon-upload"></span>
diff --git a/templates/edit-achievement.julius b/templates/edit-achievement.julius
new file mode 100644
index 0000000..1d0933c
--- /dev/null
+++ b/templates/edit-achievement.julius
@@ -0,0 +1,12 @@
+   var input = document.querySelector('input[data-role=tagsinput]'),
+       tagify = new Tagify( input, {
+              whitelist: #{tagsAvailableAsJSON},
+              autocomplete: true,
+              enforeWhitelist: true});
+   input.style.display = 'none';
+
+  $(document).ready(function() {
+     $("table").DataTable({
+       'pageLength': 50,
+       'order': [[1, 'desc']]});
+  } );