diff --git a/client/blueprints/Milestones.py b/client/blueprints/Milestones.py
index b95188c26a779968f4af751f3710e9d4742ac61a..6c901e66bf48f3c941639e098b20ceb0e72c35de 100644
--- a/client/blueprints/Milestones.py
+++ b/client/blueprints/Milestones.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
 import requests
 from flask import Blueprint, render_template, redirect, url_for, request
 
@@ -9,6 +11,9 @@ from logic.Localization import LOCALIZATION
 def construct_blueprint(urlBuilder):
     milestones = Blueprint('admin_milestones', __name__)
 
+    DATE_FORMAT_API = '%d.%m.%Y'
+    DATE_FORMAT_INPUT_FIELD = '%Y-%m-%d'
+
     @milestones.route('/admin/milestones/overview', methods=['GET'])
     @require_api_token
     def overview():
@@ -53,9 +58,15 @@ def construct_blueprint(urlBuilder):
         milestone = requests.get(urlBuilder.build_url('milestone', ID)).json()
         if milestone['DueDate'] == '-':
             milestone['DueDate'] = ''
+        else:
+            milestone['DueDate'] = datetime.strptime(milestone['DueDate'], DATE_FORMAT_API).strftime(
+                DATE_FORMAT_INPUT_FIELD)
 
         if milestone['CompletionDate'] == '-':
             milestone['CompletionDate'] = ''
+        else:
+            milestone['DueDate'] = datetime.strptime(milestone['CompletionDate'], DATE_FORMAT_API).strftime(
+                DATE_FORMAT_INPUT_FIELD)
 
         return render_template('admin/milestones/edit.html',
                                title='Edit Milestone',
diff --git a/client/version.json b/client/version.json
index 093a93b80b70f8ae1f29e8bfd2347a108c30158f..b15927cf03418368907c30b303715223bbcf1100 100644
--- a/client/version.json
+++ b/client/version.json
@@ -1,7 +1,7 @@
 {
     "version": {
-        "name": "v1.6.0",
-        "code": 23,
+        "name": "v1.6.1",
+        "code": 24,
         "date": "15.04.22"
     }
 }
\ No newline at end of file