--- a/project/templates/_menu_user.html	Tue Jul 20 15:46:53 2010 +0530
+++ b/project/templates/_menu_user.html	Tue Jul 20 15:48:35 2010 +0530
@@ -6,14 +6,14 @@
             <strong>{{ user.username }}</strong>
         {% endif %} |
 
-        <a href="{% url scipycon_account %}">My profile</a> |
+        <a href="{% url scipycon_account params.scope %}">My profile</a> |
 
         {% if user.is_superuser %}
                 <a href="/admin/">Administer</a> |
         {% endif %}
 
-        <a href="{% url scipycon_logout %}">Logout</a>
+        <a href="{% url scipycon_logout params.scope %}">Logout</a>
     {% else %}
-        <a href="{% url scipycon_login %}">Login</a>
+        <a href="{% url scipycon_login params.scope %}">Login</a>
     {% endif %}
 </div>

--- a/project/templates/user/_usermenu.html	Tue Jul 20 15:46:53 2010 +0530
+++ b/project/templates/user/_usermenu.html	Tue Jul 20 15:48:35 2010 +0530
@@ -1,16 +1,16 @@
 <div class="right">
     <ul class="horizontal-menu">
         <li>
-            <a href="{% url scipycon_account %}">My Profile</a>
+            <a href="{% url scipycon_account params.scope %}">My Profile</a>
         </li>
         <li>
-            <a href="{% url scipycon_edit_profile %}">Edit Profile</a>
+            <a href="{% url scipycon_edit_profile params.scope %}">Edit Profile</a>
         </li>
         <li>
-            <a href="{% url scipycon_password %}">Change Password</a>
+            <a href="{% url scipycon_password params.scope %}">Change Password</a>
         </li>
         <li>
-            <a href="{% url scipycon_username %}">Change Username</a>
+            <a href="{% url scipycon_username params.scope %}">Change Username</a>
         </li>
     </ul>
 </div>

--- a/project/templates/user/account.html	Tue Jul 20 15:46:53 2010 +0530
+++ b/project/templates/user/account.html	Tue Jul 20 15:48:35 2010 +0530
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
-          <li class="last"><a
-            href="mailto:kauaerangastore@xtra.co.nz">kauaerangastore@xtra.co.nz</a></li>
+<!-- 
+<li class="last">
+<a href="mailto:kauaerangastore@xtra.co.nz">kauaerangastore@xtra.co.nz</a></li>
+ -->
 <!-- TODO: Lot of fees related and New Zealand group related info. -->
 {% block title %}My Profile{% endblock %}
 
@@ -25,7 +27,7 @@
             <span>{{ user.get_full_name }}</span>
         {% else %}
         <span class="important">No name, please <a 
-            href="{% url scipycon_edit_profile %}">edit profile</a>.</span>
+            href="{% url scipycon_edit_profile params.scope %}">edit profile</a>.</span>
         {% endif %}
         </td>
         <td rowspan="4">

--- a/project/templates/user/login.html	Tue Jul 20 15:46:53 2010 +0530
+++ b/project/templates/user/login.html	Tue Jul 20 15:48:35 2010 +0530
@@ -9,36 +9,31 @@
         <h2 class="authenticate">Login</h2>
 
         <div class="description">
-            Log in for registered users of the site.
+          Log in for registered users of the site.
         </div>
 
         <form class="authenticate"
               enctype="multipart/form-data"
-              action="{% url scipycon_login %}"
+              action="{% url scipycon_login params.scope %}"
               method="post">
 
-                <table class="scipycon-default">
-                    {{ login_form }}
-                    <tr>
-                        <td></td>
-                        <td>
-                            <a href="{% url scipycon_password_reset %}">Forgot password?</a>
-                        </td>
-                    </tr>
-                </table>
+          <table class="scipycon-default">
+            {{ login_form }}
+            <tr>
+              <td></td>
+              <td>
+                <a href="{% url scipycon_password_reset %}">
+                  Forgot password?
+                </a>
+              </td>
+            </tr>
+          </table>
 
-            <input type="hidden"
-                   name="action"
-                   value="login" />
+          <input type="hidden" name="action" value="login" />
 
-            <input type="hidden"
-                   name="next"
-                   value="{{ next_url }}" />
+          <input type="hidden" name="next" value="{{ next_url }}" />
 
-            <button class="button left"
-                    type="submit">
-                Login
-            </button>
+          <button class="button left" type="submit">Login</button>
 
         </form>
     </div>
@@ -50,23 +45,16 @@
             If you are not already a member of the site you can register here.
         </div>
 
-        <form action="{% url scipycon_login %}"
-              method="post">
-                    <table class="scipycon-default">
-                        {{ register_form }}
-                    </table>
-                <input type="hidden"
-                       name="action"
-                       value="register" />
+        <form action="{% url scipycon_login params.scope %}" method="post">
+          <table class="scipycon-default">
+            {{ register_form }}
+          </table>
 
-                <input type="hidden"
-                       name="next"
-                       value="{{ next_url }}" />
+          <input type="hidden" name="action" value="register" />
 
-                <button class="button left"
-                        type="submit">
-                    Register
-                </button>
+          <input type="hidden" name="next" value="{{ next_url }}" />
+
+          <button class="button left" type="submit">Register</button>
         </form>
     </div>
 {% endblock content %}