diff --git a/beat/web/algorithms/templates/algorithms/edition.html b/beat/web/algorithms/templates/algorithms/edition.html
index 8de28f385f75ef4f13e5ad684bd63060e2d98f2b..5237b283d0ad4e5b0218a15a8b3f8c62e2ac95ab 100644
--- a/beat/web/algorithms/templates/algorithms/edition.html
+++ b/beat/web/algorithms/templates/algorithms/edition.html
@@ -2,21 +2,21 @@
 {% comment %}
  * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
  * Contact: beat.support@idiap.ch
- * 
+ *
  * This file is part of the beat.web module of the BEAT platform.
- * 
+ *
  * Commercial License Usage
  * Licensees holding valid commercial BEAT licenses may use this file in
  * accordance with the terms contained in a written agreement between you
  * and Idiap. For further information contact tto@idiap.ch
- * 
+ *
  * Alternatively, this file may be used under the terms of the GNU Affero
  * Public License version 3 as published by the Free Software and appearing
  * in the file LICENSE.AGPL included in the packaging of this file.
  * The BEAT platform is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.
- * 
+ *
  * You should have received a copy of the GNU Affero Public License along
  * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
 {% endcomment %}
@@ -226,23 +226,23 @@ function setupEditor(algorithm, dataformats, libraries)
       url:  '{% url 'api_algorithms:object' algorithm_author algorithm_name algorithm_version %}',
         {% else %}
       type: 'POST',
-      url:  '{% url 'api_algorithms:list_create' algorithm_author %}',
+      url: '{% url 'api_algorithms:list_create' algorithm_author %}',
         {% endif %}
       data: JSON.stringify({
         {% if not edition %}
         {% if algorithm_version > 1 and not fork_of %}
-        name:              '{{ algorithm_name }}',
-        previous_version:  '{{ algorithm_author }}/{{ algorithm_name }}/{{ algorithm_version|add:-1 }}',
-          {% else %}
-        name:              $('#algorithm_name')[0].value.trim(),
+        name: '{{ algorithm_name }}',
+        previous_version:'{{ algorithm_author }}/{{ algorithm_name }}/{{ algorithm_version|add:-1 }}',
+        {% else %}
+        name: $('#algorithm_name')[0].value.trim(),
         {% endif %}
-        short_description: (algorithm && algorithm.short_description) || '',
         description: (algorithm && algorithm.description) || '',
-          {% endif %}
-        declaration:       JSON.stringify(declaration),
-        code:              source_code_editor.getSourceCode(),
-          {% if fork_of %}
-        fork_of:           '{{ fork_of.fullname }}',
+        {% endif %}
+        short_description: (algorithm && algorithm.short_description) || '',
+        declaration: JSON.stringify(declaration),
+        code: source_code_editor.getSourceCode(),
+        {% if fork_of %}
+        fork_of: '{{ fork_of.fullname }}',
         {% endif %}
       }),
       contentType: "application/json; charset=utf-8",
@@ -506,9 +506,11 @@ jQuery(document).ready(function() {
   {% if original_author %}
   var algorithm = null;
   {% else %}
-  var algorithm = {'short_description': '',
-    'description': '',
-    'html_description': ''};
+  var algorithm = {
+    'short_description': '{{ short_description }}',
+    'description': '{{ description }}',
+    'html_description': '{{ html_description }}'
+  };
   {% endif %}
   var dataformats = null;
   var libraries = null;