diff --git a/client/src/app/shared/shared-user-subscription/remote-subscribe.component.ts b/client/src/app/shared/shared-user-subscription/remote-subscribe.component.ts
index 61bcd5345..295b0812a 100644
--- a/client/src/app/shared/shared-user-subscription/remote-subscribe.component.ts
+++ b/client/src/app/shared/shared-user-subscription/remote-subscribe.component.ts
@@ -35,7 +35,9 @@ export class RemoteSubscribeComponent extends FormReactive implements OnInit {
   }
 
   formValidated () {
-    const address = this.form.value['text']
+    let address = this.form.value['text'] || ''
+    address = address.replace(/^@/, '')
+
     const [ username, hostname ] = address.split('@')
 
     const protocol = window.location.protocol