diff --git a/blocks/ORB/Login.pm b/blocks/ORB/Login.pm
index b746ba6..643a9d5 100755
--- a/blocks/ORB/Login.pm
+++ b/blocks/ORB/Login.pm
@@ -777,11 +777,11 @@ sub _generate_signin_form {
         $self -> {"template"} -> load_template("login/persist_disabled.tem");
 
     return ("{L_LOGIN_TITLE}",
-            $self -> {"template"} -> load_template("login/signin.tem", {"%(error)s"      => $error,
-                                                                        "%(persist)s"    => $persist,
-                                                                        "%(url-forgot)s" => $self -> build_url("block" => "login", "pathinfo" => [ "recover" ]),
-                                                                        "%(target)s"     => $self -> build_url("block" => "login"),
-                                                                        "%(username)s"   => $args -> {"username"}}),
+            $self -> {"template"} -> load_template("login/form_signin.tem", {"%(error)s"      => $error,
+                                                                             "%(persist)s"    => $persist,
+                                                                             "%(url-forgot)s" => $self -> build_url("block" => "login", "pathinfo" => [ "recover" ]),
+                                                                             "%(target)s"     => $self -> build_url("block" => "login"),
+                                                                             "%(username)s"   => $args -> {"username"}}),
             $self -> {"template"} -> load_template("login/extrahead.tem"),
             $self -> {"template"} -> load_template("login/extrajs.tem"));
 }
@@ -804,12 +804,12 @@ sub _generate_signup_form {
         if($error);
 
     return ("{L_LOGIN_SIGNUP_TITLE}",
-            $self -> {"template"} -> load_template("login/signup.tem", {"%(error)s"        => $error,
-                                                                        "%(sitekey)s"      => $self -> {"settings"} -> {"config"} -> {"Login:recaptcha_sitekey"},
-                                                                        "%(url-activate)s" => $self -> build_url("block" => "login", "pathinfo" => [ "activate" ]),
-                                                                        "%(target)s"       => $self -> build_url("block" => "login", "pathinfo" => [ "signup" ]),
-                                                                        "%(username)s"     => $args -> {"username"},
-                                                                        "%(email)s"        => $args -> {"email"}}),
+            $self -> {"template"} -> load_template("login/form_signup.tem", {"%(error)s"        => $error,
+                                                                             "%(sitekey)s"      => $self -> {"settings"} -> {"config"} -> {"Login:recaptcha_sitekey"},
+                                                                             "%(url-activate)s" => $self -> build_url("block" => "login", "pathinfo" => [ "activate" ]),
+                                                                             "%(target)s"       => $self -> build_url("block" => "login", "pathinfo" => [ "signup" ]),
+                                                                             "%(username)s"     => $args -> {"username"},
+                                                                             "%(email)s"        => $args -> {"email"}}),
             $self -> {"template"} -> load_template("login/signup_extrahead.tem"),
             $self -> {"template"} -> load_template("login/extrajs.tem"));
 }
@@ -829,9 +829,9 @@ sub _generate_actcode_form {
         if($error);
 
     return ("{L_LOGIN_TITLE}",
-            $self -> {"template"} -> load_template("login/act_form.tem", {"%(error)s"      => $error,
-                                                                          "%(target)s"     => $self -> build_url("block" => "login"),
-                                                                          "%(url-resend)s" => $self -> build_url("block" => "login", "pathinfo" => [ "resend" ]),}),
+            $self -> {"template"} -> load_template("login/form_activate.tem", {"%(error)s"      => $error,
+                                                                               "%(target)s"     => $self -> build_url("block" => "login"),
+                                                                               "%(url-resend)s" => $self -> build_url("block" => "login", "pathinfo" => [ "resend" ]),}),
             $self -> {"template"} -> load_template("login/extrahead.tem"),
             $self -> {"template"} -> load_template("login/extrajs.tem"));
 }
diff --git a/templates/default/login/act_form.tem b/templates/default/login/form_activate.tem
similarity index 100%
rename from templates/default/login/act_form.tem
rename to templates/default/login/form_activate.tem
diff --git a/templates/default/login/signin.tem b/templates/default/login/form_signin.tem
similarity index 100%
rename from templates/default/login/signin.tem
rename to templates/default/login/form_signin.tem
diff --git a/templates/default/login/signup.tem b/templates/default/login/form_signup.tem
similarity index 96%
rename from templates/default/login/signup.tem
rename to templates/default/login/form_signup.tem
index 4c16c7a..be78c42 100644
--- a/templates/default/login/signup.tem
+++ b/templates/default/login/form_signup.tem
@@ -14,7 +14,7 @@
                                 <input type="text" id="email" name="email" size="24" maxlength="255" value="%(email)s"/>
                             </label>
                         </div>
-                        <div class="contextlink">(<a href="%(url-activate)s">{L_LOGIN_ACTFORM}</a>)</div>
+                        <div class="contextlink">(<a href="%(url-activate)s">{L_LOGIN_ACTIVATE_FORM}</a>)</div>
                         <div class="g-recaptcha" data-sitekey="%(sitekey)s"></div>
                         <div class="submit clearfix">
                             <input type="submit" class="button float-right nomargin" id="signup" name="signup" value="{L_LOGIN_SIGNUP}" />