diff --git a/Admin/Templates/playerinfo.tpl b/Admin/Templates/playerinfo.tpl
index 4846f29f..815f8911 100644
--- a/Admin/Templates/playerinfo.tpl
+++ b/Admin/Templates/playerinfo.tpl
@@ -184,9 +184,6 @@
 										elseif($quest >=37) {$questname = "Finish"; }
 										else { $questname = "Unknown"; }
 										$quesst = $quest;
-										if($quest > 18){
-										$quesst = $quest - 3;
-										}
 										$questinfo = "$quesst - $questname";
 									?>
 								<input disabled="disabled" style="width: 80%;" class="fm" name="quest" value="<?php echo $questinfo; ?>"> <a href="admin.php?p=editUser&uid=<?php echo $id; ?>"><img src="../img/admin/edit.gif" title="Edit Quest"></a></td>
diff --git a/README b/README
index 7075a726..aa1e9a51 100644
--- a/README
+++ b/README
@@ -44,6 +44,7 @@ martinambrus changes:
 32. messages sent to Multihunter now have the correct recepient shown next to them (was empty)
 33. new links in Admin to access in-game messages + Mass Message & System Message dialogs
 34. mass messages sent out under Support rather than Multihunter (we should not be scaring people :D)
+35. fixed displaying of current Quest in Admin
 
 
 Shadowss changes:
diff --git a/todo.txt b/todo.txt
index 69dd4f68..1ee54448 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1,3 @@
-- fix editing current task from Taskmaster -> number never match the edited quest after save
 - cannot delete a single medal in admin
 - add back buttons to Admin where there are not (like editing a user)
 - disallow installation if existing data are in place, or world map would end up screwed and villages not showing (because there can be multiple villages/oasis generated for one square then)