diff --git a/module/bug/ui/create.html.php b/module/bug/ui/create.html.php
index 2925f38ff1..183dfbc84e 100644
--- a/module/bug/ui/create.html.php
+++ b/module/bug/ui/create.html.php
@@ -313,7 +313,7 @@ formPanel
             editor
             (
                 set::name('steps'),
-                set::value($bug->steps ? htmlSpecialString($bug->steps) : '')
+                html($bug->steps)
             )
         ),
     ),
@@ -402,9 +402,8 @@ formPanel
         formGroup
         (
             set::label($lang->bug->files),
-            set::name('files[]'),
-            set::control('file')
-        ),
+            upload()
+        )
     )
 );
 
diff --git a/module/bug/ui/edit.html.php b/module/bug/ui/edit.html.php
index b54ed7f3af..2610925d79 100644
--- a/module/bug/ui/edit.html.php
+++ b/module/bug/ui/edit.html.php
@@ -53,7 +53,7 @@ detailBody
         section
         (
             set::title($lang->bug->title),
-            formGroup
+            input
             (
                 set::name('title'),
                 set::value($bug->title)
@@ -62,34 +62,23 @@ detailBody
         section
         (
             set::title($lang->bug->legendSteps),
-            formGroup
+            editor
             (
-                editor
-                (
-                    set::name('steps'),
-                    set::value($bug->steps)
-                )
+                set::name('steps'),
+                html($bug->steps)
             )
         ),
         section
         (
             set::title($lang->files),
-            formGroup
-            (
-                set::name('files[]'),
-                set::control('file')
-            ),
+            upload()
         ),
         section
         (
             set::title($lang->bug->legendComment),
-            formGroup
+            editor
             (
-                editor
-                (
-                    set::name('comment'),
-                    set::value()
-                )
+                set::name('comment'),
             )
         )
     ),