diff --git a/ui/component/commentCreate/view.jsx b/ui/component/commentCreate/view.jsx
index 3b31bdc54..5b48e6439 100644
--- a/ui/component/commentCreate/view.jsx
+++ b/ui/component/commentCreate/view.jsx
@@ -432,7 +432,10 @@ export function CommentCreate(props: Props) {
       <div
         role="button"
         className="comment-create__auth"
-        onClick={() => {
+        onClick={(e) => {
+          e.preventDefault();
+          e.stopPropagation();
+
           if (embed) {
             window.open(`https://odysee.com/$/${PAGES.AUTH}?redirect=/$/${PAGES.LIVESTREAM}`);
             return;
@@ -446,10 +449,18 @@ export function CommentCreate(props: Props) {
           }
         }}
       >
-        <FormField type="textarea" name={'comment_signup_prompt'} placeholder={__('Say something about this...')} />
-        <div className="section__actions--no-margin">
-          <Button disabled button="primary" label={__('Post --[button to submit something]--')} requiresAuth />
-        </div>
+        <FormField
+          type="textarea"
+          name="comment__signup-prompt"
+          placeholder={__('Say something about this...')}
+          disabled={isMobile}
+        />
+
+        {!isMobile && (
+          <div className="section__actions--no-margin">
+            <Button disabled button="primary" label={__('Post --[button to submit something]--')} requiresAuth />
+          </div>
+        )}
       </div>
     );
   }
diff --git a/ui/scss/component/_textarea-suggestions.scss b/ui/scss/component/_textarea-suggestions.scss
index 32b5f5db5..40e3d70ce 100644
--- a/ui/scss/component/_textarea-suggestions.scss
+++ b/ui/scss/component/_textarea-suggestions.scss
@@ -14,7 +14,21 @@
 
 .comment-create__auth {
   .MuiAutocomplete-root {
-    margin-bottom: var(--spacing-m);
+    @media (min-width: $breakpoint-small) {
+      margin-top: var(--spacing-xxs);
+    }
+
+    @media (min-width: $breakpoint-small) {
+      margin-bottom: var(--spacing-m);
+    }
+  }
+}
+
+.livestream__comment-create {
+  .comment-create__auth {
+    .MuiAutocomplete-root {
+      margin-top: 0px;
+    }
   }
 }