diff --git a/fas/fas/templates/group/new.html b/fas/fas/templates/group/new.html
index 4afa717..8ae2a66 100644
--- a/fas/fas/templates/group/new.html
+++ b/fas/fas/templates/group/new.html
@@ -35,7 +35,7 @@
       </div>
       <div class="field">
         <label for="prerequisite">${_('Must Belong To:')}</label>
-        <input type="text" id="prerequisite" name="prerequisite" value="cla_click" />
+        <input type="text" id="prerequisite" name="prerequisite" value="cla_sign" />
       </div>
       <div class="field">
         <label for="joinmsg">${_('Join Message:')}</label>
diff --git a/fas/fas/templates/group/view.html b/fas/fas/templates/group/view.html
index 9160dea..cfa0a1f 100644
--- a/fas/fas/templates/group/view.html
+++ b/fas/fas/templates/group/view.html
@@ -28,7 +28,7 @@
       </div>
     </form>
     <a py:if="group in person.memberships" href="${tg.url('/group/remove/%s/%s' % (group.name, person.username))}">${_('Remove me')}</a>
-    <script py:if="group in person.memberships" type="text/javascript">var hb7 = new HelpBalloon({dataURL: '%{tg.url('/help/get_help/group_remove')}'});</script>
+    <script py:if="group in person.memberships" type="text/javascript">var hb7 = new HelpBalloon({dataURL: '${tg.url('/help/get_help/group_remove')}'});</script>
     <h3>Group Details <a py:if="auth.canAdminGroup(person, group)" href="${tg.url('/group/edit/%s' % group.name)}">${_('(edit)')}</a></h3>
     <div class="userbox">
       <dl>
diff --git a/fas/fas/templates/user/view.html b/fas/fas/templates/user/view.html
index 98fde0e..eea161a 100644
--- a/fas/fas/templates/user/view.html
+++ b/fas/fas/templates/user/view.html
@@ -19,10 +19,11 @@
         <!--<dt>${_('Bugzilla Email:')}</dt><dd>${person.username}</dd>-->
         <dt>${_('IRC Nick:')}</dt><dd>${person.ircnick}&nbsp;</dd>
         <dt>${_('PGP Key:')}</dt><dd>${person.gpg_keyid}&nbsp;</dd>
-        <dt>${_('Telephone Number:')}</dt><dd>${person.telephone}&nbsp;</dd>
-        <dt>${_('Postal Address:')}</dt><dd>${person.postal_address}&nbsp;</dd>
+        <py:if test="personal"><dt>${_('Telephone Number:')}</dt><dd>${person.telephone}&nbsp;</dd></py:if>
+        <py:if test="personal"><dt>${_('Postal Address:')}</dt><dd>${person.postal_address}&nbsp;</dd></py:if>
         <dt>${_('Comments:')}</dt><dd>${person.comments}&nbsp;</dd>
-        <dt>${_('Password:')}</dt><dd><span class="approved">${_('Valid')}</span> <a href="${tg.url('/user/changepass')}" py:if="personal">(change)</a></dd>
+        <py:if test="personal"><dt>${_('Password:')}</dt><dd><span class="approved">${_('Valid')}</span> <a href="${tg.url('/user/changepass')}">(change)</a></dd></py:if>
+        <!-- TODO: Make this actually get data -->
         <dt>${_('Account Status:')}</dt><dd><span class="approved">${_('Valid')}</span>
         <script type="text/javascript">var hb1 = new HelpBalloon({dataURL: '${tg.url('/help/get_help/user_account_status')}'});</script></dd>
         <!-- cla = {None, 'signed', 'clicked'} -->