diff --git a/templates/blog/post_show.html.twig b/templates/blog/post_show.html.twig
index 9ccc10e10..ab701f1e6 100644
--- a/templates/blog/post_show.html.twig
+++ b/templates/blog/post_show.html.twig
@@ -25,7 +25,7 @@
             {{ render(controller('App\\Controller\\BlogController:commentForm', {'id': post.id})) }}
         {% else %}
             <p>
-                <a class="btn btn-success" href="{{ path('security_login') }}">
+                <a class="btn btn-success" href="{{ path('security_login', {'next': app.request.pathInfo}) }}">
                     <i class="fa fa-sign-in" aria-hidden="true"></i> {{ 'action.sign_in'|trans }}
                 </a>
                 {{ 'post.to_publish_a_comment'|trans }}
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index a512043ec..9f08700cc 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -28,6 +28,7 @@
                             <label for="password">{{ 'label.password'|trans }}</label>
                             <input type="password" id="password" name="_password" class="form-control" />
                         </div>
+                        <input type="hidden" name="_target_path" value="{{ app.request.get('next') }}"/>
                         <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}"/>
                         <button type="submit" class="btn btn-primary">
                             <i class="fa fa-sign-in" aria-hidden="true"></i> {{ 'action.sign_in'|trans }}