diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb
index 774d1c100..3ffc4f9b0 100644
--- a/app/views/boards/_course_new.html.erb
+++ b/app/views/boards/_course_new.html.erb
@@ -126,16 +126,14 @@
         <p id="subjectmsg"></p>
       </div>
       <div id="topic_editor" style="display: none;">
-        <%if User.current.member_of_course?(course) %>
-            <div class="mt10">
-          <% if User.current.id == course.tea_id %>
-              <%= f.check_box :sticky, :value => topic.sticky %>
-              <%= label_tag 'message_sticky', l(:label_board_sticky) %>
-          <%= f.check_box :locked, :value => topic.locked %>
-          <%= label_tag 'message_locked', l(:label_board_locked) %>
-          <% end %>
-          <div class="cl"></div>
-        </div>
+        <%if User.current.allowed_to?(:as_teacher, course) %>
+          <div class="mt10">
+            <%= f.check_box :sticky, :value => topic.sticky %>
+            <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+            <%= f.check_box :locked, :value => topic.locked %>
+            <%= label_tag 'message_locked', l(:label_board_locked) %>
+            <div class="cl"></div>
+          </div>
         <% end %>
         <div class="mt10">
           <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 2e401c19a..c41a8d254 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -6,8 +6,10 @@
     function reset_topic(){
         $("#message_subject").val("");
         $("#subjectmsg").text("");
-        document.getElementById("message_sticky").checked=false;
-        document.getElementById("message_locked").checked=false;
+        if(document.getElementById("message_sticky") && document.getElementById("message_locked")){
+            document.getElementById("message_sticky").checked=false;
+            document.getElementById("message_locked").checked=false;
+        }
         $("#topic_attachments").html("<%= escape_javascript(render :partial => 'attachments/form_course', :locals => {:container => Message.new, :isReply => @isReply})%>");
         message_content_editor.html("");
         $("#topic_editor").toggle();