diff --git a/src/components/RegisterPage.vue b/src/components/RegisterPage.vue
index 4817a4ac..d55f016b 100644
--- a/src/components/RegisterPage.vue
+++ b/src/components/RegisterPage.vue
@@ -52,6 +52,8 @@ export default {
     methods: {
         register() {
             if (!this.username || !this.password) return;
+            if (this.username.includes("@") && !confirm(this.$t("info.register_no_email_note"))) return;
+
             this.fetchJson(this.authApiUrl() + "/register", null, {
                 method: "POST",
                 body: JSON.stringify({
diff --git a/src/locales/en.json b/src/locales/en.json
index fab0ced3..09afa88f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -168,6 +168,7 @@
         "page_not_found": "Page not found",
         "copied": "Copied!",
         "cannot_copy": "Can't copy!",
-        "local_storage": "This action requires localStorage, are cookies enabled?"
+        "local_storage": "This action requires localStorage, are cookies enabled?",
+	  "register_no_email_note": "Piped has detected that you are using an email as username to register. Providing an email is not required to register on Piped. If you still want to continue, press OK."
     }
 }