diff --git a/modules/commons/commons_q_a/commons_q_a.module b/modules/commons/commons_q_a/commons_q_a.module
index d9a3783c3b72d4050410856a91710220c82b6d24..ef2e792062788e15c0cd99b2f7a6862bd5842781 100644
--- a/modules/commons/commons_q_a/commons_q_a.module
+++ b/modules/commons/commons_q_a/commons_q_a.module
@@ -35,24 +35,31 @@ function commons_q_a_commons_bw_group_widget() {
   );
 }
 
+/**
+ * Implements hook_node_view().
+ *
+ * Provides an answer button to bring a user down to the answer form.
+ */
 function commons_q_a_node_view($node, $view_mode) {
-  if($node->type == 'question' && $view_mode == 'full') {
+  if ($node->type == 'question' && $view_mode == 'full') {
     // Remove add comment link.
     unset($node->content['links']['comment']);
     // Add the answer link below.
-    $node->content['links']['answer'] = array(
-      '#theme' => 'links__node__answer',
-      '#links' => array(
-        'answer-add' => array(
-          'title' => t('Answer'),
-          'attributes' => array(
-            'title' => t('Answer this question')
+    if (node_access('create', 'answer')) {
+      $node->content['links']['answer'] = array(
+        '#theme' => 'links__node__answer',
+        '#links' => array(
+          'answer-add' => array(
+            'title' => t('Answer'),
+            'attributes' => array(
+              'title' => t('Answer this question'),
+            ),
+            'href' => 'node/' . $node->nid,
+            'fragment' => 'answer',
           ),
-          'href' => 'node/'.$node->nid,
-          'fragment' => 'answer',
         ),
-      ),
-    );
+      );
+    }
     return $node;
   }
 }
diff --git a/modules/commons/commons_q_a/commons_q_a.views_default.inc b/modules/commons/commons_q_a/commons_q_a.views_default.inc
index 23814a0b7a81a448b1e1c1bce4994e7ced1867b2..91a3c4208de16301c095980d835b2b34961a9940 100644
--- a/modules/commons/commons_q_a/commons_q_a.views_default.inc
+++ b/modules/commons/commons_q_a/commons_q_a.views_default.inc
@@ -155,7 +155,7 @@ function commons_q_a_views_default_views() {
   $handler->display->display_options['empty']['area']['table'] = 'views';
   $handler->display->display_options['empty']['area']['field'] = 'area';
   $handler->display->display_options['empty']['area']['empty'] = TRUE;
-  $handler->display->display_options['empty']['area']['content'] = 'This question hasn\'t been answered yet. You can be the first to answer it!';
+  $handler->display->display_options['empty']['area']['content'] = 'This question hasn\'t been answered yet.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
@@ -230,7 +230,7 @@ function commons_q_a_views_default_views() {
     t('‹ previous'),
     t('next ›'),
     t('last »'),
-    t('This question hasn\'t been answered yet. You can be the first to answer it!'),
+    t('This question hasn\'t been answered yet.'),
     t('All'),
     t('Content pane'),
     t('Commons'),