diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 13a731f7f63..830cad50f8b 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -35,6 +35,17 @@ code {
display: none;
}
+ a {
+ color: $highlight-text-color;
+ text-decoration: underline;
+
+ &:hover,
+ &:active,
+ &:focus {
+ text-decoration: none;
+ }
+ }
+
.input {
margin-bottom: 16px;
overflow: hidden;
diff --git a/app/views/oauth/authorizations/new.html.haml b/app/views/oauth/authorizations/new.html.haml
index c50c224cce6..7cd8dbef089 100644
--- a/app/views/oauth/authorizations/new.html.haml
+++ b/app/views/oauth/authorizations/new.html.haml
@@ -6,6 +6,8 @@
%h3= t('doorkeeper.authorizations.new.title')
%p= t('doorkeeper.authorizations.new.prompt_html', client_name: content_tag(:strong, @pre_auth.client.name))
+ - if @pre_auth.client.application.owner
+ %p= t('doorkeeper.authorizations.new.prompt_author_html', author_profile: link_to(@pre_auth.client.application.owner.account.local_username_and_domain, account_path(@pre_auth.client.application.owner.account)))
%h3= t('doorkeeper.authorizations.new.review_permissions')
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index b623cc71350..7f2b4e9586c 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -61,6 +61,7 @@ en:
title: An error has occurred
new:
prompt_html: "%{client_name} would like permission to access your account. It is a third-party application. If you do not trust it, then you should not authorize it."
+ prompt_author_html: 'This application was created by @%{author_profile}'
review_permissions: Review permissions
title: Authorization required
show: