diff --git a/app/Http/Controllers/AvatarController.php b/app/Http/Controllers/AvatarController.php
index ebcf99a6c..31824abcb 100644
--- a/app/Http/Controllers/AvatarController.php
+++ b/app/Http/Controllers/AvatarController.php
@@ -58,7 +58,7 @@ class AvatarController extends Controller
         $path = $this->buildPath($id);
         $dir = storage_path('app/'.$path);
         $this->checkDir($dir);
-        $name = 'avatar.'.$file->guessExtension();
+        $name = str_random(20).'_avatar.'.$file->guessExtension();
         $res = ['root' => 'storage/app/'.$path, 'name' => $name, 'storage' => $path];
 
         return $res;
diff --git a/resources/views/status/compose.blade.php b/resources/views/status/compose.blade.php
index 8cf297d12..8b5251a2f 100644
--- a/resources/views/status/compose.blade.php
+++ b/resources/views/status/compose.blade.php
@@ -63,7 +63,7 @@
         <input type="file" name="media" class="d-none file-input" multiple="">
         <div class="caption d-none">
           <div class="form-group mb-0">
-            <input type="text" class="form-control input-elevated font-weight-bold" placeholder="Add an optional caption">
+            <textarea class="form-control input-elevated font-weight-bold" placeholder="Add an optional caption"></textarea>
           </div>
         </div>
         <div class="options"></div>
@@ -470,7 +470,7 @@ $(document).on('click', '#create', function(e) {
   $('.composeLoader').removeClass('d-none');
   let data = {
     media: pixelfed.uploader.meta,
-    caption: $('.caption input').val(),
+    caption: $('.caption textarea').val(),
     visibility: pixelfed.uploader.visibility,
   };
   axios.post('/api/local/status/compose', data)