diff --git a/fas/client/fasClient b/fas/client/fasClient
index defa10b..a71bf0b 100755
--- a/fas/client/fasClient
+++ b/fas/client/fasClient
@@ -466,7 +466,7 @@ class MakeShellAccounts(BaseClient):
         sorted.sort()
         for person in sorted:
             email_file.write("%s: %s\n" % (person, self.emails[person]))
-        usernames = self.usernames()
+        usernames = self.usernames
         for group in self.groups:
             name = group['name']
             members = {}
diff --git a/fas/fas/templates/user/verifyemail.html b/fas/fas/templates/user/verifyemail.html
new file mode 100644
index 0000000..945a33b
--- /dev/null
+++ b/fas/fas/templates/user/verifyemail.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:py="http://genshi.edgewall.org/"
+  xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../master.html" />
+  <head>
+    <title>${_('Confirm Email Change Request')}</title>
+  </head>
+  <body>
+    <h2>${_('Confirm Email Change Request')}</h2>
+    <form action="${tg.url('/user/setemail/%s') % token}" method="post">
+      <div>
+        <p>
+        Do you really want to change your email to: ${person.unverified_email} ?
+        </p>
+        <input type="submit" name="confirmation" id="confirmation" value="${_('Confirm')}" />
+        <input type="submit" value="${_('Cancel')}" />
+      </div>
+    </form>
+  </body>
+</html>
diff --git a/fas/fas/user.py b/fas/fas/user.py
index f1fe020..5e8adb7 100644
--- a/fas/fas/user.py
+++ b/fas/fas/user.py
@@ -458,6 +458,10 @@ forward to working with you!
         if not person.password == crypt.crypt(currentpassword, person.password):
             turbogears.flash('Your current password did not match')
             return dict()
+        # TODO: Enable this when we need to.
+        #if currentpassword == password:
+        #    turbogears.flash('Your new password cannot be the same as your old one.')
+        #    return dict()
         newpass = generate_password(password)
         try:
             person.password = newpass['hash']
