diff --git a/Echo.i18n.php b/Echo.i18n.php
index 7cda4ce80..0ba21834c 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -65,7 +65,7 @@ $messages['en'] = array(
 	'notifications' => 'Notifications',
 	'tooltip-pt-notifications' => 'Your notifications',
 	'echo-specialpage' => 'Notifications',
-	'echo-anon' => 'To receive notifications, [[Special:Userlogin/signup|create an account]] or [[Special:UserLogin|log in]].',
+	'echo-anon' => 'To receive notifications, [$1 create an account] or [$2 log in].',
 	'echo-none' => 'You have no notifications.',
 	'echo-more-info' => 'More info',
 	'echo-feedback' => 'Feedback',
@@ -258,7 +258,10 @@ Parameters:
 	'tooltip-pt-notifications' => 'This is used for the title (mouseover text) of the notifications user tool.',
 	'echo-specialpage' => 'Special page title for Special:Notifications.
 {{Identical|Notification}}',
-	'echo-anon' => 'Error message shown to users who try to visit Special:Notifications as an anon.',
+	'echo-anon' => 'Error message shown to users who try to visit Special:Notifications as an anon.
+
+* $1 - URL of signup page, with returnto pointing to Special:Notifications
+* $2 - URL of login page, with returnto pointing to Special:Notifications',
 	'echo-none' => 'Message shown to users who have no notifications. Also shown in the overlay.',
 	'echo-more-info' => 'This is used for the title (mouseover text) of an icon that links to a page with more information about the Echo extension.',
 	'echo-feedback' => 'Text for a link that goes to a feedback survey shown at [[Special:Notifications]].
@@ -615,7 +618,7 @@ $messages['ast'] = array(
 	'notifications' => 'Avisos',
 	'tooltip-pt-notifications' => 'Los sos avisos',
 	'echo-specialpage' => 'Avisos',
-	'echo-anon' => 'Pa recibir avisos, [[Special:Userlogin/signup|cree una cuenta]] o [[Special:UserLogin|anicie sesión]].',
+	'echo-anon' => 'Pa recibir avisos, [$1 cree una cuenta] o [$2 anicie sesión].',
 	'echo-none' => 'Nun tien avisos.',
 	'echo-more-info' => 'Más información',
 	'echo-feedback' => 'La so opinión',
@@ -704,7 +707,7 @@ $messages['azb'] = array(
 	'echo-error-no-formatter' => 'بیلدیری اوچون بیر فورمت تعریفی یوخدور',
 	'notifications' => 'بیلدیریلر',
 	'echo-specialpage' => 'منیم بیلدیریلریم', # Fuzzy
-	'echo-anon' => 'بیلدیریلری آلماق اوچون، [[Special:Userlogin/signup|بیر حساب یارادین]] یادا [[Special:UserLogin|گیریش ائدین]].',
+	'echo-anon' => 'بیلدیریلری آلماق اوچون، [$1 بیر حساب یارادین] یادا [$2 گیریش ائدین].',
 	'echo-none' => 'سیزین بیلدیرینیز یوخدور.',
 	'notification-new-user' => '{{SITENAME}}-ه خوش گلمیسینیز، $1!', # Fuzzy
 	'echo-email-subject-default' => '{{SITENAME}}-ده یئنی بیلدیری',
@@ -812,7 +815,7 @@ $messages['be-tarask'] = array(
 	'notifications' => 'Абвесткі',
 	'tooltip-pt-notifications' => 'Вашыя абвесткі',
 	'echo-specialpage' => 'Абвесткі',
-	'echo-anon' => 'Для атрыманьня абвестак [[Special:Userlogin/signup|стварыце рахунак]] або [[Special:UserLogin|увайдзіце]].',
+	'echo-anon' => 'Для атрыманьня абвестак [$1 стварыце рахунак] або [$2 увайдзіце].',
 	'echo-none' => 'Вы ня маеце абвестак.',
 	'echo-more-info' => 'Болей',
 	'echo-feedback' => 'Водгук',
@@ -945,7 +948,7 @@ $messages['bn'] = array(
 	'notifications' => 'বিজ্ঞপ্তি',
 	'tooltip-pt-notifications' => 'আপনার বিজ্ঞপ্তি',
 	'echo-specialpage' => 'বিজ্ঞপ্তি',
-	'echo-anon' => 'বিজ্ঞপ্তি পেতে, [[Special:Userlogin/signup|অ্যাকাউন্ট তৈরি]] অথবা [[Special:UserLogin|প্রবেশ]] করুন।',
+	'echo-anon' => 'বিজ্ঞপ্তি পেতে, [$1 অ্যাকাউন্ট তৈরি] অথবা [$2 প্রবেশ] করুন।',
 	'echo-none' => 'আপনার কোন বিজ্ঞপ্তি নাই।',
 	'echo-more-info' => 'আরও তথ্য',
 	'echo-feedback' => 'প্রতিক্রিয়া',
@@ -1315,7 +1318,7 @@ $messages['cs'] = array(
 	'notifications' => 'Upozornění',
 	'tooltip-pt-notifications' => 'Vaše upozornění',
 	'echo-specialpage' => 'Upozornění',
-	'echo-anon' => 'Pro zobrazování upozornění je nutné [[Special:Userlogin/signup|vytvořit si účet]] nebo [[Special:UserLogin|se přihlásit]].',
+	'echo-anon' => 'Pro zobrazování upozornění je nutné [$1 vytvořit si účet] nebo [$2 se přihlásit].',
 	'echo-none' => 'Nemáte žádné upozornění.',
 	'echo-more-info' => 'Více informací',
 	'echo-feedback' => 'Názor',
@@ -1462,7 +1465,7 @@ $messages['da'] = array(
 	'notifications' => 'Meddelelser',
 	'tooltip-pt-notifications' => 'Dine meddelelser',
 	'echo-specialpage' => 'Meddelelser',
-	'echo-anon' => 'For at modtage meddelelser skal du [[Special:Userlogin/signup|oprette en konto]] eller [[Special:UserLogin|logge ind]].',
+	'echo-anon' => 'For at modtage meddelelser skal du [$1 oprette en konto] eller [$2 logge ind].',
 	'echo-none' => 'Du har ingen meddelelser.',
 	'echo-more-info' => 'Mere information',
 	'echo-feedback' => 'Feedback',
@@ -1567,7 +1570,7 @@ $messages['de'] = array(
 	'notifications' => 'Benachrichtigungen',
 	'tooltip-pt-notifications' => 'Deine Benachrichtigungen',
 	'echo-specialpage' => 'Benachrichtigungen',
-	'echo-anon' => 'Um Benachrichtigungen erhalten zu können, muss man ein [[Special:Userlogin/signup|Benutzerkonto anlegen]] oder sich [[Special:UserLogin|anmelden]].',
+	'echo-anon' => 'Um Benachrichtigungen erhalten zu können, muss man ein [$1 Benutzerkonto anlegen] oder sich [$2 anmelden].',
 	'echo-none' => 'Du hast keine Benachrichtigungen.',
 	'echo-more-info' => 'Mehr Informationen',
 	'echo-feedback' => 'Rückmeldung',
@@ -1711,7 +1714,7 @@ $messages['el'] = array(
 	'notifications' => 'Ειδοποιήσεις',
 	'tooltip-pt-notifications' => 'Οι ειδοποιήσεις σας',
 	'echo-specialpage' => 'Ειδοποιήσεις',
-	'echo-anon' => 'Για να λαμβάνετε ειδοποιήσεις, [[Special:Userlogin/signup|δημιουργήστε ένα λογαριασμό]] ή [[Special:UserLogin|συνδεθείτε]].',
+	'echo-anon' => 'Για να λαμβάνετε ειδοποιήσεις, [$1 δημιουργήστε ένα λογαριασμό] ή [$2 συνδεθείτε].',
 	'echo-none' => 'Δεν έχετε ειδοποιήσεις.',
 	'echo-more-info' => 'Περισσότερες πληροφορίες',
 	'echo-feedback' => 'Ανατροφοδότηση',
@@ -1811,7 +1814,7 @@ $messages['es'] = array(
 	'notifications' => 'Notificaciones',
 	'tooltip-pt-notifications' => 'Mis notificaciones',
 	'echo-specialpage' => 'Notificaciones',
-	'echo-anon' => 'Para recibir notificaciones, [[Special:Userlogin/signup|crea una cuenta]] o [[Special:UserLogin|inicia sesión]].',
+	'echo-anon' => 'Para recibir notificaciones, [$1 crea una cuenta] o [$2 inicia sesión].',
 	'echo-none' => 'No tienes notificaciones.',
 	'echo-more-info' => 'Más información',
 	'echo-feedback' => 'Comentarios',
@@ -1933,7 +1936,7 @@ $messages['et'] = array(
 	'notifications' => 'Teavitused',
 	'tooltip-pt-notifications' => 'Sinu teavitused',
 	'echo-specialpage' => 'Teavitused',
-	'echo-anon' => 'Et teavitusi saada, [[Special:Userlogin/signup|loo konto]] või [[Special:UserLogin|logi sisse]].',
+	'echo-anon' => 'Et teavitusi saada, [$1 loo konto] või [$2 logi sisse].',
 	'echo-none' => 'Sul pole uusi teavitusi.',
 	'echo-more-info' => 'Lisateave',
 	'echo-feedback' => 'Tagasiside',
@@ -2054,7 +2057,7 @@ $messages['fa'] = array(
 	'notifications' => 'اعلامیه‌ها',
 	'tooltip-pt-notifications' => 'اعلان‌های شما',
 	'echo-specialpage' => 'اعلامیه‌ها',
-	'echo-anon' => 'برای دریافت اعلان‌ها [[Special:Userlogin/signup|حسابی بسازید]] یا [[Special:UserLogin|وارد سامانه شوید]] .',
+	'echo-anon' => 'برای دریافت اعلان‌ها [$1 حسابی بسازید] یا [$2 وارد سامانه شوید] .',
 	'echo-none' => 'شما هیچگونه اعلانی ندارید.',
 	'echo-more-info' => 'اطلاعات بیشتر',
 	'echo-feedback' => 'بازخورد',
@@ -2229,7 +2232,7 @@ $messages['fi'] = array(
 	'notifications' => 'Ilmoitukset',
 	'tooltip-pt-notifications' => 'Omat ilmoitukset',
 	'echo-specialpage' => 'Ilmoitukset',
-	'echo-anon' => 'Jos haluat saada ilmoituksia, [[Special:Userlogin/signup|luo käyttäjätunnus]] tai [[Special:UserLogin|kirjaudu sisään]].',
+	'echo-anon' => 'Jos haluat saada ilmoituksia, [$1 luo käyttäjätunnus] tai [$2 kirjaudu sisään].',
 	'echo-none' => 'Ei uusia ilmoituksia.',
 	'echo-more-info' => 'Lisätietoja',
 	'echo-feedback' => 'Palaute',
@@ -2357,7 +2360,7 @@ $messages['fr'] = array(
 	'notifications' => 'Notifications',
 	'tooltip-pt-notifications' => 'Vos notifications',
 	'echo-specialpage' => 'Notifications',
-	'echo-anon' => 'Pour recevoir des notifications, [[Special:Userlogin/signup|créez un compte]] ou [[Special:UserLogin|connectez-vous]].',
+	'echo-anon' => 'Pour recevoir des notifications, [$1 créez un compte] ou [$2 connectez-vous].',
 	'echo-none' => "Vous n'avez reçu aucune notification.",
 	'echo-more-info' => "Plus d'information",
 	'echo-feedback' => 'Avis',
@@ -2527,7 +2530,7 @@ $messages['gl'] = array(
 	'notifications' => 'Notificacións',
 	'tooltip-pt-notifications' => 'As súas notificacións',
 	'echo-specialpage' => 'Notificacións',
-	'echo-anon' => 'Para recibir notificacións, [[Special:Userlogin/signup|cree unha conta]] ou [[Special:UserLogin|acceda ao sistema]].',
+	'echo-anon' => 'Para recibir notificacións, [$1 cree unha conta] ou [$2 acceda ao sistema].',
 	'echo-none' => 'Non ten ningunha notificación.',
 	'echo-more-info' => 'Máis información',
 	'echo-feedback' => 'Comentarios',
@@ -2657,7 +2660,7 @@ $messages['he'] = array(
 	'notifications' => 'הודעות',
 	'tooltip-pt-notifications' => 'ההודעות שלך',
 	'echo-specialpage' => 'הודעות',
-	'echo-anon' => 'כדי לקבל הודעות, [[Special:Userlogin/signup|יש ליצור חשבון]] או [[Special:UserLogin|להיכנס]].',
+	'echo-anon' => 'כדי לקבל הודעות, [$1 יש ליצור חשבון] או [$2 להיכנס].',
 	'echo-none' => 'אין לך הודעות.',
 	'echo-more-info' => 'מידע נוסף',
 	'echo-feedback' => 'משוב',
@@ -2771,7 +2774,7 @@ $messages['hsb'] = array(
 	'notifications' => 'Zdźělenki',
 	'tooltip-pt-notifications' => 'Twoje zdźělenki',
 	'echo-specialpage' => 'Zdźělenki',
-	'echo-anon' => 'Zo by zdźělenki dóstał, dyrbiš [[Special:Userlogin/signup|konto załožić]] abo [[Special:UserLogin|so přizjewić]].',
+	'echo-anon' => 'Zo by zdźělenki dóstał, dyrbiš [$1 konto załožić] abo [$2 so přizjewić].',
 	'echo-none' => 'Nimaš zdźělenki.',
 	'echo-more-info' => 'Dalše informacije',
 	'notification-new-user' => 'Witaj do {{GRAMMAR:genitiw|{{SITENAME}}}}, $1! Wjeselimy so, zo sy tu.',
@@ -2856,7 +2859,7 @@ $messages['hu'] = array(
 	'notifications' => 'Értesítések',
 	'tooltip-pt-notifications' => 'Értesítéseid',
 	'echo-specialpage' => 'Értesítések',
-	'echo-anon' => 'Értesítések fogadásához [[Special:Userlogin/signup|hozz létre egy fiókot]] vagy [[Special:UserLogin|jelentkezz be]].',
+	'echo-anon' => 'Értesítések fogadásához [$1 hozz létre egy fiókot] vagy [$2 jelentkezz be].',
 	'echo-none' => 'Nincsenek értesítéseid.',
 	'echo-more-info' => 'További információ',
 	'echo-feedback' => 'Visszajelzés',
@@ -2974,7 +2977,7 @@ $messages['ia'] = array(
 	'notifications' => 'Notificationes',
 	'tooltip-pt-notifications' => 'Tu notificationes',
 	'echo-specialpage' => 'Notificationes',
-	'echo-anon' => 'Pro reciper notificationes, [[Special:Userlogin/signup|crea un conto]] o [[Special:UserLogin|aperi session]].',
+	'echo-anon' => 'Pro reciper notificationes, [$1 crea un conto] o [$2 aperi session].',
 	'echo-none' => 'Tu non ha notificationes.',
 	'echo-more-info' => 'Plus info',
 	'echo-feedback' => 'Commentario',
@@ -3108,7 +3111,7 @@ $messages['it'] = array(
 	'notifications' => 'Notifiche',
 	'tooltip-pt-notifications' => 'Tutte le notifiche',
 	'echo-specialpage' => 'Notifiche',
-	'echo-anon' => 'Per ricevere le notifiche, [[Special:Userlogin/signup|registrati]] o [[Special:UserLogin|entra]].',
+	'echo-anon' => 'Per ricevere le notifiche, [$1 registrati] o [$2 entra].',
 	'echo-none' => 'Non hai notifiche.',
 	'echo-more-info' => 'Altre informazioni',
 	'echo-feedback' => 'Commenti',
@@ -3229,7 +3232,7 @@ $messages['ja'] = array(
 	'notifications' => '通知',
 	'tooltip-pt-notifications' => '自分の通知',
 	'echo-specialpage' => '通知',
-	'echo-anon' => '通知を受け取るには、[[Special:Userlogin/signup|アカウント作成]]または[[Special:UserLogin|ログイン]]をしてください。',
+	'echo-anon' => '通知を受け取るには、[$1 アカウント作成]または[$2 ログイン]をしてください。',
 	'echo-none' => '通知はありません。',
 	'echo-more-info' => '詳細情報',
 	'echo-feedback' => 'フィードバック',
@@ -3314,7 +3317,7 @@ $messages['jv'] = array(
 	'echo-no-title' => '[Ora ana judhul]', # Fuzzy
 	'notifications' => 'Wara-wara',
 	'echo-specialpage' => 'Wara-wara kula', # Fuzzy
-	'echo-anon' => 'Kanggo nampa wara-wara [[Special:Userlogin/signup|gawé akun]] utawa [[Special:UserLogin|mlebu log]].',
+	'echo-anon' => 'Kanggo nampa wara-wara [$1 gawé akun] utawa [$2 mlebu log].',
 	'echo-none' => 'Sampéyan durung nampa wara-wara apa-apa.', # Fuzzy
 	'echo-email-subject-default' => 'Wara-wara anyar nèng {{SITENAME}}',
 	'echo-email-body-default' => 'Sampéyan nduwé wara-wara anyar nèng {{SITENAME}}:
@@ -3403,7 +3406,7 @@ $messages['ko'] = array(
 	'notifications' => '알림',
 	'tooltip-pt-notifications' => '내 알림',
 	'echo-specialpage' => '알림',
-	'echo-anon' => '알림을 받으려면 [[Special:Userlogin/signup|계정을 만들거나]] [[Special:UserLogin|로그인]]하세요.',
+	'echo-anon' => '알림을 받으려면 [$1 계정을 만들거나] [$2 로그인]하세요.',
 	'echo-none' => '알림이 없습니다.',
 	'echo-more-info' => '자세한 정보',
 	'echo-feedback' => '피드백 남기기',
@@ -3486,7 +3489,7 @@ $messages['ksh'] = array(
 	'echo-no-title' => '[Kein Sigg]',
 	'notifications' => 'Meddeilonge',
 	'echo-specialpage' => 'Ming Meddeilonge', # Fuzzy
-	'echo-anon' => 'Do moß Desch [[Special:Userlogin/signup|aanmälde]] udder [[Special:UserLogin|enlogge]], öm Medeilonge krijje ze künne.',
+	'echo-anon' => 'Do moß Desch [$1 aanmälde] udder [$2 enlogge], öm Medeilonge krijje ze künne.',
 	'echo-none' => 'Ende läzde Zigg häß De kein Medeilonge krääje.', # Fuzzy
 	'notification-new-user' => '$1, welkumme op {{GENDER:Dative|{{SITENAME}}}}!', # Fuzzy
 	'echo-email-subject-default' => 'En neue Medeilong op {{GRAMMAR:dative|{{ucfirst:{{SITENAME}}}}}}',
@@ -3546,7 +3549,7 @@ $messages['lb'] = array(
 	'notifications' => 'Notifikatiounen',
 	'tooltip-pt-notifications' => 'Är Notifikatiounen',
 	'echo-specialpage' => 'Notifikatiounen',
-	'echo-anon' => 'Fir Notifikatiounen ze kréien, [[Special:Userlogin/signup|maacht e Benotzerkont op]] oder [[Special:UserLogin|loggt Iech an]]',
+	'echo-anon' => 'Fir Notifikatiounen ze kréien, [$1 maacht e Benotzerkont op] oder [$2 loggt Iech an]',
 	'echo-none' => 'Dir hutt keng Notifikatiounen.',
 	'echo-more-info' => 'Méi Informatiounen',
 	'echo-feedback' => 'Feedback',
@@ -3697,7 +3700,7 @@ $messages['lv'] = array(
 	'notifications' => 'Paziņojumi',
 	'tooltip-pt-notifications' => 'Jūsu paziņojumi',
 	'echo-specialpage' => 'Paziņojumi',
-	'echo-anon' => 'Lai saņemtu paziņojumus, [[Special:Userlogin/signup|izveidojiet lietotāja kontu]] vai [[Special:UserLogin|pieslēdzietes]].',
+	'echo-anon' => 'Lai saņemtu paziņojumus, [$1 izveidojiet lietotāja kontu] vai [$2 pieslēdzietes].',
 	'echo-none' => 'Jums nav paziņojumu.',
 	'echo-more-info' => 'Vairāk informācijas',
 	'echo-feedback' => 'Atsauksmes',
@@ -3808,7 +3811,7 @@ $messages['mk'] = array(
 	'notifications' => 'Известувања',
 	'tooltip-pt-notifications' => 'Вашите известувања',
 	'echo-specialpage' => 'Известувања',
-	'echo-anon' => 'За да добивате известувања, [[Special:Userlogin/signup|направете сметка]] или [[Special:UserLogin|најавете се]].',
+	'echo-anon' => 'За да добивате известувања, [$1 направете сметка] или [$2 најавете се].',
 	'echo-none' => 'Немате известувања.',
 	'echo-more-info' => 'Повеќе информации',
 	'echo-feedback' => 'Мислења',
@@ -3931,7 +3934,7 @@ $messages['ml'] = array(
 	'notifications' => 'അറിയിപ്പുകൾ',
 	'tooltip-pt-notifications' => 'താങ്കൾക്കുള്ള അറിയിപ്പുകൾ',
 	'echo-specialpage' => 'അറിയിപ്പുകൾ',
-	'echo-anon' => 'അറിയിപ്പുകൾ ലഭിക്കാനായി, [[Special:Userlogin/signup|അംഗത്വമെടുക്കയോ]] [[Special:UserLogin|പ്രവേശിക്കുകയോ]] ചെയ്യേണ്ടതാണ്.',
+	'echo-anon' => 'അറിയിപ്പുകൾ ലഭിക്കാനായി, [$1 അംഗത്വമെടുക്കയോ] [$2 പ്രവേശിക്കുകയോ] ചെയ്യേണ്ടതാണ്.',
 	'echo-none' => 'താങ്കൾക്ക് അറിയിപ്പുകളൊന്നുമില്ല.',
 	'echo-more-info' => 'കൂടുതൽ വിവരങ്ങൾ',
 	'echo-feedback' => 'പ്രതികരണം',
@@ -4071,7 +4074,7 @@ $messages['ms'] = array(
 	'notifications' => 'Pemberitahuan',
 	'tooltip-pt-notifications' => 'Pemberitahuan anda',
 	'echo-specialpage' => 'Pemberitahuan',
-	'echo-anon' => 'Untuk menerima pemberitahuan, sila [[Special:Userlogin/signup|buka akaun]] atau [[Special:UserLogin|log masuk]].',
+	'echo-anon' => 'Untuk menerima pemberitahuan, sila [$1 buka akaun] atau [$2 log masuk].',
 	'echo-none' => 'Tiada pemberitahuan untuk anda.',
 	'echo-more-info' => 'Maklumat lanjut',
 	'echo-feedback' => 'Maklum balas',
@@ -4154,7 +4157,7 @@ $messages['mt'] = array(
 	'echo-no-title' => '[L-ebda paġna]',
 	'notifications' => 'Notifiki',
 	'echo-specialpage' => 'Notifiki tiegħi', # Fuzzy
-	'echo-anon' => 'Sabiex tirċievi notifiki, [[Special:Userlogin/signup|oħloq kont]] jew [[Special:UserLogin|illoggja]].',
+	'echo-anon' => 'Sabiex tirċievi notifiki, [$1 oħloq kont] jew [$2 illoggja].',
 	'echo-none' => "M'għandek l-ebda notifiki",
 	'notification-new-user' => 'Merħba fuq {{SITENAME}}, $1!', # Fuzzy
 	'echo-email-subject-default' => 'Notifika ġdida fuq {{SITENAME}}',
@@ -4213,7 +4216,7 @@ $messages['nb'] = array(
 	'notifications' => 'Varsler',
 	'tooltip-pt-notifications' => 'Dine varsler',
 	'echo-specialpage' => 'Varsler',
-	'echo-anon' => 'For å motta varsler, [[Special:Userlogin/signup|opprett en konto]] eller [[Special:UserLogin|logg inn]].',
+	'echo-anon' => 'For å motta varsler, [$1 opprett en konto] eller [$2 logg inn].',
 	'echo-none' => 'Du har ingen varsler.',
 	'echo-more-info' => 'Mer informasjon',
 	'echo-feedback' => 'Tilbakemelding',
@@ -4345,7 +4348,7 @@ $messages['nl'] = array(
 	'notifications' => 'Meldingen',
 	'tooltip-pt-notifications' => 'Uw meldingen',
 	'echo-specialpage' => 'Meldingen',
-	'echo-anon' => '[[Special:Userlogin/signup|Maak een gebruiker aan]] of [[Special:UserLogin|meld u aan]] als u meldingen wilt ontvangen.',
+	'echo-anon' => '[$1 Maak een gebruiker aan] of [$2 meld u aan] als u meldingen wilt ontvangen.',
 	'echo-none' => 'U hebt geen meldingen.',
 	'echo-more-info' => 'Meer info',
 	'echo-feedback' => 'Terugkoppeling',
@@ -4506,7 +4509,7 @@ $messages['pl'] = array(
 	'notifications' => 'Powiadomienia',
 	'tooltip-pt-notifications' => 'Twoje powiadomienia',
 	'echo-specialpage' => 'Powiadomienia',
-	'echo-anon' => 'Aby otrzymywać powiadomienia, [[Special:Userlogin/signup|załóż konto]] lub [[Special:UserLogin|zaloguj się]].',
+	'echo-anon' => 'Aby otrzymywać powiadomienia, [$1 załóż konto] lub [$2 zaloguj się].',
 	'echo-none' => 'Nie masz żadnych powiadomień.',
 	'echo-more-info' => 'Więcej informacji',
 	'echo-feedback' => 'Opinie',
@@ -4597,7 +4600,7 @@ $messages['pms'] = array(
 	'notifications' => 'Notìfiche',
 	'tooltip-pt-notifications' => 'Toe notìfiche',
 	'echo-specialpage' => 'Mie notìfiche', # Fuzzy
-	'echo-anon' => "Për arseive dle notìfiche, [[Special:Userlogin/signup|ch'a crea un cont]] o [[Special:UserLogin|ch'a intra ant ël sistema]].",
+	'echo-anon' => "Për arseive dle notìfiche, <span class=\"plainlinks\">[$1 ch'a crea un cont] o <span class=\"plainlinks\">[$2 ch'a intra ant ël sistema].",
 	'echo-none' => "A l'ha gnun-e notìfiche.",
 	'echo-more-info' => "Pi d'anformassion",
 	'notification-edit-talk-page2' => "[[User:$1|$1]] {{GENDER:$1|a l'ha publicà}} dzora a soa [[User talk:$2#$3|pàgina ëd ciaciarade]].", # Fuzzy
@@ -4722,7 +4725,7 @@ $messages['pt'] = array(
 	'notifications' => 'Notificações',
 	'tooltip-pt-notifications' => 'As suas notificações',
 	'echo-specialpage' => 'Notificações',
-	'echo-anon' => 'Para receber notificações, [[Special:Userlogin/signup|crie uma conta]] ou [[Special:UserLogin|entre]] na sua.',
+	'echo-anon' => 'Para receber notificações, [$1 crie uma conta] ou [$2 entre] na sua.',
 	'echo-none' => 'Não tem notificações.',
 	'echo-more-info' => 'Mais informações',
 	'echo-feedback' => 'Comentários',
@@ -4762,16 +4765,16 @@ $messages['pt'] = array(
 	'notification-user-rights-email-subject' => 'Os seus privilégios de utilizador foram alterados em {{SITENAME}}',
 	'notification-user-rights-email-batch-body' => 'OS seus privilégios de utilizador foram {{GENDER:$1|alterados}} por $1. $2.',
 	'echo-email-subject-default' => 'Nova notificação em {{SITENAME}}',
-	'echo-email-body-default' => 'Tem uma nova notificação em {{SITENAME}}: 
+	'echo-email-body-default' => 'Tem uma nova notificação em {{SITENAME}}:
 
 $1',
 	'echo-email-batch-body-default' => 'Tem uma nova notificação.',
-	'echo-email-footer-default' => '$2 
+	'echo-email-footer-default' => '$2
 
-Para controlar quais os e-mails que deseja receber, consulte as suas preferências: {{canonicalurl:{{#special:Preferences}}#mw-prefsection-echo}} 
+Para controlar quais os e-mails que deseja receber, consulte as suas preferências: {{canonicalurl:{{#special:Preferences}}#mw-prefsection-echo}}
 
 $1',
-	'echo-email-footer-default-html' => 'Para controlar quais os e-mails que deseja receber, <a href="$2" style="text-decoration:none; color: #3868B0;">consulte as suas preferências</a>.<br /> 
+	'echo-email-footer-default-html' => 'Para controlar quais os e-mails que deseja receber, <a href="$2" style="text-decoration:none; color: #3868B0;">consulte as suas preferências</a>.<br />
 $1',
 	'echo-overlay-link' => 'Todas as notificações',
 	'echo-overlay-title' => '<b>Notificações</b>',
@@ -4786,7 +4789,7 @@ $1',
 	'notification-page-linked-email-batch-bundle-body' => '$2 foi {{GENDER:$1|ligada}} a partir de $3 e $4 para {{PLURAL:$5|outra página|outras páginas}}',
 	'echo-email-batch-subject-daily' => 'Tem {{PLURAL:$2|uma nova notificação|novas notificações}} em {{SITENAME}}',
 	'echo-email-batch-subject-weekly' => 'Tem {{PLURAL:$2|uma nova notificação|novas notificações}} em {{SITENAME}} esta semana',
-	'echo-email-batch-body-intro-daily' => 'Olá $1, 
+	'echo-email-batch-body-intro-daily' => 'Olá $1,
 Aqui está um resumo da actividade de hoje em {{SITENAME}} para si.',
 	'echo-email-batch-body-intro-weekly' => 'Olá $1,
 Aqui está um resumo da actividade desta semana em {{SITENAME}} para si.',
@@ -4965,7 +4968,7 @@ $messages['ro'] = array(
 	'notifications' => 'Notificări',
 	'tooltip-pt-notifications' => 'Notificările dumneavoastră',
 	'echo-specialpage' => 'Notificări',
-	'echo-anon' => 'Pentru a primi notificări, [[Special:Userlogin/signup|creați-vă un cont]] sau [[Special:UserLogin|autentificați-vă]].',
+	'echo-anon' => 'Pentru a primi notificări, [$1 creați-vă un cont] sau [$2 autentificați-vă].',
 	'echo-none' => 'Nu aveți nicio notificare.',
 	'echo-more-info' => 'Mai multe informații',
 	'echo-feedback' => 'Reacții',
@@ -5084,7 +5087,7 @@ $messages['roa-tara'] = array(
 	'notifications' => 'Notificaziune',
 	'tooltip-pt-notifications' => 'Le notifiche tune',
 	'echo-specialpage' => 'Notificaziune',
-	'echo-anon' => "Pe ricevere notifiche, [[Special:Userlogin/signup|ccreje 'nu cunde]] o [[Special:UserLogin|tràse]].",
+	'echo-anon' => "Pe ricevere notifiche, <span class=\"plainlinks\">[$1 ccreje 'nu cunde] o <span class=\"plainlinks\">[$2 tràse].",
 	'echo-none' => 'Non ge tìne notifiche.',
 	'echo-more-info' => "Cchiù 'mbormaziune",
 	'echo-feedback' => 'Segnalazione',
@@ -5213,7 +5216,7 @@ $messages['ru'] = array(
 	'notifications' => 'Уведомления',
 	'tooltip-pt-notifications' => 'Ваши уведомления',
 	'echo-specialpage' => 'Уведомления',
-	'echo-anon' => 'Чтобы получать уведомления, [[Special:Userlogin/signup|создайте учётную запись]] или [[Special:UserLogin|представьтесь]].',
+	'echo-anon' => 'Чтобы получать уведомления, [$1 создайте учётную запись] или [$2 представьтесь].',
 	'echo-none' => 'Вы не получали уведомлений.',
 	'echo-more-info' => 'Подробнее',
 	'echo-feedback' => 'Обратная связь',
@@ -5288,7 +5291,7 @@ $messages['si'] = array(
 	'notifications' => 'නිවේදන',
 	'tooltip-pt-notifications' => 'ඔබේ නිවේදන',
 	'echo-specialpage' => 'නිවේදන',
-	'echo-anon' => 'නිවේදන ලබා ගැනීම සඳහා, [[Special:Userlogin/signup|ගිණුමක් තනන්න]] හෝ [[Special:UserLogin|ප්‍රවිෂ්ට වන්න]].',
+	'echo-anon' => 'නිවේදන ලබා ගැනීම සඳහා, [$1 ගිණුමක් තනන්න] හෝ [$2 ප්‍රවිෂ්ට වන්න].',
 	'echo-none' => 'ඔබට නිවේදන කිසිවක් නොමැත.',
 	'notification-new-user' => '{{SITENAME}} වෙත පිළිගනිමු, $1!', # Fuzzy
 	'echo-email-subject-default' => '{{SITENAME}} හී නව නිවේදනයක්',
@@ -5444,7 +5447,7 @@ $messages['sv'] = array(
 	'notifications' => 'Meddelanden',
 	'tooltip-pt-notifications' => 'Dina meddelanden',
 	'echo-specialpage' => 'Meddelanden',
-	'echo-anon' => 'För att ta emot meddelanden, [[Special:Userlogin/signup|skapa ett konto]] eller [[Special:UserLogin|logga in]].',
+	'echo-anon' => 'För att ta emot meddelanden, [$1 skapa ett konto] eller [$2 logga in].',
 	'echo-none' => 'Du har inga meddelanden.',
 	'echo-more-info' => 'Mer information',
 	'echo-feedback' => 'Feedback',
@@ -5528,7 +5531,7 @@ $messages['ta'] = array(
 	'echo-no-title' => '[தலைப்பு இல்லை]', # Fuzzy
 	'notifications' => 'அறிவிப்புகள்',
 	'echo-specialpage' => 'என் அறிவிப்புகள்', # Fuzzy
-	'echo-anon' => 'அறிவிப்புகளைப் பெறுவதற்கு [[Special:Userlogin/signup|ஒரு கணக்கை உருவாக்குங்கள்]] அல்லது [[Special:UserLogin|உள்நுழையுங்கள்]].',
+	'echo-anon' => 'அறிவிப்புகளைப் பெறுவதற்கு [$1 ஒரு கணக்கை உருவாக்குங்கள்] அல்லது [$2 உள்நுழையுங்கள்].',
 	'echo-email-subject-default' => '{{SITENAME}}இல்  புதிய அறிவிப்புகள்',
 	'echo-email-body-default' => '{{SITENAME}} இல் உங்களுக்கு ஒரு புதிய அறிவிப்பு உள்ளது:
 
@@ -5550,7 +5553,7 @@ $messages['tl'] = array(
 	'echo-no-title' => '[Walang Pamagat]', # Fuzzy
 	'notifications' => 'Mga pagpapabatid',
 	'echo-specialpage' => 'Mga pagpapabatid ko', # Fuzzy
-	'echo-anon' => 'Upang makatanggap ng mga pagpapabatid, [[Special:Userlogin/signup|lumikha ng isang akawnt]] o [[Special:UserLogin|lumagdang papasok]].',
+	'echo-anon' => 'Upang makatanggap ng mga pagpapabatid, [$1 lumikha ng isang akawnt] o [$2 lumagdang papasok].',
 	'echo-none' => 'Hindi ka nakakatanggap ng anumang mga pagpapabatid nitong mga uling panahon!', # Fuzzy
 	'notification-new-user' => 'Maligayang Pagdating sa {{SITENAME}}, $1!', # Fuzzy
 	'echo-email-subject-default' => 'Bagong pagpapabatid sa {{SITENAME}}',
@@ -5674,7 +5677,7 @@ $messages['uk'] = array(
 	'notifications' => 'Сповіщення',
 	'tooltip-pt-notifications' => 'Ваші сповіщення',
 	'echo-specialpage' => 'Сповіщення',
-	'echo-anon' => 'Для отримання сповіщень, [[Special:Userlogin/signup|створіть обліковий запис]] або [[Special:UserLogin|увійдіть]].',
+	'echo-anon' => 'Для отримання сповіщень, [$1 створіть обліковий запис] або [$2 увійдіть].',
 	'echo-none' => 'У Вас немає сповіщень.',
 	'echo-more-info' => 'Детальніше',
 	'echo-feedback' => "Зворотний зв'язок",
@@ -5810,7 +5813,7 @@ $messages['vi'] = array(
 	'notifications' => 'Thông báo',
 	'tooltip-pt-notifications' => 'Các thông báo cho bạn',
 	'echo-specialpage' => 'Thông báo',
-	'echo-anon' => 'Để nhận thông báo, hãy [[Special:Userlogin/signup|mở tài khoản]] hoặc [[Special:UserLogin|đăng nhập]].',
+	'echo-anon' => 'Để nhận thông báo, hãy [$1 mở tài khoản] hoặc [$2 đăng nhập].',
 	'echo-none' => 'Bạn không có thông báo.',
 	'echo-more-info' => 'Thêm thông tin',
 	'echo-feedback' => 'Phản hồi',
@@ -5896,7 +5899,7 @@ $messages['yi'] = array(
 	'echo-no-title' => '[קיין בלאט]',
 	'echo-error-no-formatter' => 'קיין פארמאטירונג נישט דעפינירט פאר דער הודעה.',
 	'echo-error-preference' => 'פעלער: נישט געווען מעגלעך צו שטעלן באניצער פרעפערענץ.',
-	'echo-anon' => 'כדי צו באקומען הודעות, [[Special:Userlogin/signup|שאפט א קאנטע]] אדער [[Special:UserLogin|לאגירט אריין]].',
+	'echo-anon' => 'כדי צו באקומען הודעות, [$1 שאפט א קאנטע] אדער [$2 לאגירט אריין].',
 	'notification-add-comment2' => '[[User:$1|$1]] {{GENDER:$1|האט געלאזט א הערה}} וועגן "[[$3|$2]]" אויפן "$4" רעדן בלאט.',
 	'notification-add-talkpage-topic-yours2' => '[[User:$1|$1]] {{GENDER:$1|האט}} אײַך געשיקט אן אנזאג: "[[$3#$2|$2]]".',
 	'notification-add-comment-yours2' => '[[User:$1|$1]] {{GENDER:$1|האט געלאזט א הערה}} וועגן "[[$3#$2|$2]]" אויף אײַער רעדן בלאט.',
@@ -5969,7 +5972,7 @@ $messages['zh-hans'] = array(
 	'notifications' => '通知',
 	'tooltip-pt-notifications' => '您的通知',
 	'echo-specialpage' => '通知',
-	'echo-anon' => '要想接收通知，请[[Special:Userlogin/signup|创建帐号]]或[[Special:UserLogin|登录]]。',
+	'echo-anon' => '要想接收通知，请[$1 创建帐号]或[$2 登录]。',
 	'echo-none' => '您没有任何通知。',
 	'echo-more-info' => '更多信息',
 	'echo-feedback' => '反馈',
@@ -6089,7 +6092,7 @@ $messages['zh-hant'] = array(
 	'notifications' => '通知',
 	'tooltip-pt-notifications' => '您的通知',
 	'echo-specialpage' => '通知',
-	'echo-anon' => '要接收通知，請[[Special:Userlogin/signup|創建帳號]]或[[Special:UserLogin|登錄]]。',
+	'echo-anon' => '要接收通知，請[$1 創建帳號]或[$2 登錄]。',
 	'echo-none' => '您沒有任何通知。',
 	'echo-more-info' => '更多資訊',
 	'echo-feedback' => '意見',
diff --git a/special/SpecialNotifications.php b/special/SpecialNotifications.php
index 9d4b015c0..946e46858 100644
--- a/special/SpecialNotifications.php
+++ b/special/SpecialNotifications.php
@@ -20,7 +20,14 @@ class SpecialNotifications extends SpecialPage {
 
 		$user = $this->getUser();
 		if ( $user->isAnon() ) {
-			$out->addWikiMsg( 'echo-anon' );
+			$notificationsPageName = $this->getTitle()->getPrefixedDBkey();
+			$returnTo = array( 'returnto' => $notificationsPageName );
+			$signupTitle = SpecialPage::getTitleFor( 'UserLogin', 'signup' );
+			$signupURL = $signupTitle->getFullURL( $returnTo );
+			$loginTitle = SpecialPage::getTitleFor( 'UserLogin' );
+			$loginURL = $loginTitle->getFullURL( $returnTo );
+			$anonMsgHtml = $this->msg( 'echo-anon', $signupURL, $loginURL )->parse();
+			$out->addHTML( Html::rawElement( 'span', array( 'class' => 'plainlinks' ), $anonMsgHtml ) );
 			return;
 		}