diff --git a/application/controllers/ScheduleController.php b/application/controllers/ScheduleController.php
index 31150f5a5..4e584d726 100644
--- a/application/controllers/ScheduleController.php
+++ b/application/controllers/ScheduleController.php
@@ -95,6 +95,10 @@ class ScheduleController extends Zend_Controller_Action
 		$this->view->repeats = $formRepeats;
 		$this->view->who = $formWho;
 		$this->view->style = $formStyle;
+
+        $userInfo = Zend_Auth::getInstance()->getStorage()->read();
+        $user = new User($userInfo->id);
+        $this->view->isAdmin = $user->isAdmin();
     }
 
     public function eventFeedAction()
diff --git a/application/views/scripts/schedule/index.phtml b/application/views/scripts/schedule/index.phtml
index be67d9afc..3aad9bd0e 100644
--- a/application/views/scripts/schedule/index.phtml
+++ b/application/views/scripts/schedule/index.phtml
@@ -1,27 +1,5 @@
-<form id="add-show-form" method="post" action="" style="display:none;">
-    <div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
-        <div class="button-bar">
-            <button id="add-show-submit" class="right-floated">Add this show</button>
-            <button id="add-show-close" class="right-floated">Close</button>
-        </div>
-        <div class="clear"></div>
-        <div id="schedule-show-what">
-        <?php echo $this->what ?>
-        </div>
-        <h3 class="collapsible-header"><span class="arrow-icon"></span>When</h3>
-        <div id="schedule-show-when" class="collapsible-content">
-        <?php echo $this->when ?>
-        <?php echo $this->repeats ?>
-        </div>
-        <h3 class="collapsible-header"><span class="arrow-icon"></span>Who</h3>
-        <div id="schedule-show-who" class="collapsible-content">
-        <?php echo $this->who ?>
-        </div>
-        <h3 class="collapsible-header"><span class="arrow-icon"></span>Style</h3>
-        <div id="schedule-show-style" class="collapsible-content">
-        <?php echo $this->style ?>
-        </div>
-    </div>
-</form>
+<?php if($this->isAdmin) : ?>
+    <?php echo $this->render('schedule/add-show-form.phtml') ?>
+<?php endif; ?>
 
 <div id='schedule_calendar' class="ui-widget-content block-shadow padded omega-block"></div>
diff --git a/public/js/airtime/schedule/full-calendar-functions.js b/public/js/airtime/schedule/full-calendar-functions.js
index 9c1d1f4ac..d5e0e5926 100644
--- a/public/js/airtime/schedule/full-calendar-functions.js
+++ b/public/js/airtime/schedule/full-calendar-functions.js
@@ -53,7 +53,7 @@ function viewDisplay( view ) {
 
     }
 
-    if($('.fc-header-left tbody td').length === 5) {
+    if($("#add-show-form").length == 1 && $('.fc-header-left tbody td').length === 5) {
         $('.fc-header-left tbody tr:first')
             .append('<td><span class="fc-header-space"></span></td>')
             .append('<td><a href="#" class="add-button"><span class="add-icon"></span>Show</a></td>')