diff --git a/fas/fas/controllers.py b/fas/fas/controllers.py
index 331045d..7902051 100644
--- a/fas/fas/controllers.py
+++ b/fas/fas/controllers.py
@@ -78,9 +78,11 @@ class Root(controllers.RootController):
         user_name = turbogears.identity.current.user_name
         person = People.by_username(user_name)
         cla = None
+        cla = None
+        if clickedCLAPrivs(person):
+            cla = 'clicked'
         if signedCLAPrivs(person):
             cla = 'signed'
-
         return dict(person=person, cla=cla)
 
     @expose(template="fas.templates.about")
diff --git a/fas/fas/templates/home.html b/fas/fas/templates/home.html
index c64eb8b..2c8319f 100644
--- a/fas/fas/templates/home.html
+++ b/fas/fas/templates/home.html
@@ -23,6 +23,9 @@
           </dl>
       </py:for>
       <ul class="queue">
+        <span py:if="cla == 'clicked'" class="approved">${_('Click-through CLA')}<py:if test="personal"> (<a href="${tg.url('/cla/')}">${_('GPG Sign it!')}</a></py:if>)</span>
+        <span py:if="not cla" class="unapproved">${_('Not Done')}<py:if test="personal"> (<a href="${tg.url('/cla/')}">${_('Sign it!')}</a>)</py:if></span>
+
         <li py:if="cla == None">
           ${_('CLA Not Signed.  To become a full Fedora Contributor please ')}<a href="${tg.url('/cla/')}">${_('sign the CLA')}</a>.
         </li>
diff --git a/fas/fas/templates/user/view.html b/fas/fas/templates/user/view.html
index 804c920..52f84ef 100644
--- a/fas/fas/templates/user/view.html
+++ b/fas/fas/templates/user/view.html
@@ -35,7 +35,7 @@
         <script type="text/javascript">var hb1 = new HelpBalloon({dataURL: '${tg.url('/help/get_help/user_account_status')}'});</script></dd>
         <dt>${_('CLA:')}</dt><dd>
         <span py:if="cla == 'signed'" class="approved">${_('Signed CLA')}</span>
-        <span py:if="cla == 'clicked'" class="approved">${_('Click-through CLA')}<py:if test="personal">(<a href="${tg.url('/cla/')}">${_('GPG Sign it!')}</a></py:if>)</span>
+        <span py:if="cla == 'clicked'" class="approved">${_('Click-through CLA')}<py:if test="personal"> (<a href="${tg.url('/cla/')}">${_('GPG Sign it!')}</a></py:if>)</span>
         <span py:if="not cla" class="unapproved">${_('Not Done')}<py:if test="personal"> (<a href="${tg.url('/cla/')}">${_('Sign it!')}</a>)</py:if></span>
         <script type="text/javascript">var hb2 = new HelpBalloon({dataURL: '${tg.url('/help/get_help/user_cla')}'});</script></dd>
       </dl>