diff --git a/conf/defaults.ini b/conf/defaults.ini
index ad60ca5f9a0..4ee34159a96 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -626,6 +626,11 @@ id_response_header_namespaces = user api-key service-account
# This feature currently **only supports single-organization deployments**
managed_service_accounts_enabled = false
+#################################### Passwordless Auth ###########################
+[auth.passwordless]
+enabled = false
+code_expiration = 20m
+
#################################### SSO Settings ###########################
[sso_settings]
# interval for reloading the SSO Settings from the database
diff --git a/emails/templates/passwordless_verify_existing_user.mjml b/emails/templates/passwordless_verify_existing_user.mjml
new file mode 100644
index 00000000000..1c583bc03ad
--- /dev/null
+++ b/emails/templates/passwordless_verify_existing_user.mjml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+ {{ Subject .Subject .TemplateData "Verify your email" }}
+
+
+
+
+
+
+
+
+
+
+
Please verify your email
+
+
+ Copy and paste the confirmation code into the login form to verify your email address. This confirmation code
+ will expire in {{ .Expire }} minutes.
+
+
+
+
+
+ {{ .ConfirmationCode }}
+
+
+
+
+ Alternatively, you can use the button below to verify your email address.
+
+ Verify your email
+
+ You can also copy and paste this link into your browser directly:
+
+ {{ .AppUrl }}login?code={{ .Code }}&confirmationCode={{ .ConfirmationCode }}
+
+
+
+
+
+
+
+
+
diff --git a/emails/templates/passwordless_verify_existing_user.txt b/emails/templates/passwordless_verify_existing_user.txt
new file mode 100644
index 00000000000..ccc8f1f3d1d
--- /dev/null
+++ b/emails/templates/passwordless_verify_existing_user.txt
@@ -0,0 +1,10 @@
+[[HiddenSubject .Subject "Verify your email"]]
+
+Hi,
+
+Copy and paste the email verification code:
+[[.ConfirmationCode]]
+into the login form to verify your email address. This confirmation code will expire in {{ .Expire }} minutes.
+Alternatively, you can use the button below to verify your email address.
+
+[[.AppUrl]]login/?code=[[.Code]]&confirmationCode=[[.ConfirmationCode]]
diff --git a/emails/templates/passwordless_verify_new_user.mjml b/emails/templates/passwordless_verify_new_user.mjml
new file mode 100644
index 00000000000..d08457ea7e5
--- /dev/null
+++ b/emails/templates/passwordless_verify_new_user.mjml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+ {{ Subject .Subject .TemplateData "Welcome to Grafana, please complete your sign up!" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/emails/passwordless_verify_existing_user.txt b/public/emails/passwordless_verify_existing_user.txt
new file mode 100644
index 00000000000..18a13b74480
--- /dev/null
+++ b/public/emails/passwordless_verify_existing_user.txt
@@ -0,0 +1,12 @@
+[[HiddenSubject .Subject "Verify your email"]]
+
+Hi,
+
+Copy and paste the confirmation code in the login form to verify your email address.
+
+Copy and paste the email verification code:
+[[.ConfirmationCode]]
+in the in the login form to verify your email address. This confirmation code will expire in {{ .Expire }} minutes.
+Alternatively, you can use the button below to verify your email address.
+
+[[.AppUrl]]login/?code=[[.Code]]&confirmationCode=[[.ConfirmationCode]]
diff --git a/public/emails/passwordless_verify_new_user.html b/public/emails/passwordless_verify_new_user.html
new file mode 100644
index 00000000000..d6c04cfa58b
--- /dev/null
+++ b/public/emails/passwordless_verify_new_user.html
@@ -0,0 +1,273 @@
+
+
+
+
+ {{ Subject .Subject .TemplateData "Welcome to Grafana, please complete your sign up!" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Please complete your signup
+
+
+
+
+
+
Copy and paste the confirmation code in the sign up form to verify your email address. This confirmation code will expire in {{ .Expire }} minutes.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ .ConfirmationCode }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Alternatively, you can use the button below to complete your sign up.
+