diff --git a/modules/candidates/AddActivityScheduleEventModal.tpl b/modules/activity/AddActivityScheduleEventModal.tpl
similarity index 82%
rename from modules/candidates/AddActivityScheduleEventModal.tpl
rename to modules/activity/AddActivityScheduleEventModal.tpl
index 0b61e9c54..a21c15bfd 100644
--- a/modules/candidates/AddActivityScheduleEventModal.tpl
+++ b/modules/activity/AddActivityScheduleEventModal.tpl
@@ -1,12 +1,8 @@
 <?php /* $Id: AddActivityScheduleEventModal.tpl $ */ ?>
-<?php if ($this->isJobOrdersMode && $this->onlyScheduleEvent): ?>
-    <?php TemplateUtility::printModalHeader('Job Orders', array('modules/candidates/activityvalidator.js', 'js/activity.js'), 'Job Orders: Schedule Event'); ?>
-<?php elseif ($this->isJobOrdersMode): ?>
-    <?php TemplateUtility::printModalHeader('Job Orders', array('modules/candidates/activityvalidator.js', 'js/activity.js'), 'Job Orders: Log Activity'); ?>
-<?php elseif ($this->onlyScheduleEvent): ?>
-    <?php TemplateUtility::printModalHeader('Candidates', array('modules/candidates/activityvalidator.js', 'js/activity.js'), 'Candidates: Schedule Event'); ?>
+<?php if ($this->onlyScheduleEvent): ?>
+    <?php TemplateUtility::printModalHeader($this->activityModalTitle, array($this->activityValidatorPath, 'js/activity.js'), $this->activityModalTitle . ': Schedule Event'); ?>
 <?php else: ?>
-    <?php TemplateUtility::printModalHeader('Candidates', array('modules/candidates/activityvalidator.js', 'js/activity.js'), 'Candidates: Log Activity'); ?>
+    <?php TemplateUtility::printModalHeader($this->activityModalTitle, array($this->activityValidatorPath, 'js/activity.js'), $this->activityModalTitle . ': Log Activity'); ?>
 <?php endif; ?>
 
 <?php if (!$this->isFinishedMode): ?>
@@ -15,11 +11,11 @@
     window.CATSUserDateFormat = '<?php echo($_SESSION['CATS']->isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY'); ?>';
 </script>
 
-    <form name="logActivityForm" id="logActivityForm" action="<?php echo(CATSUtility::getIndexName()); ?>?m=<?php if ($this->isJobOrdersMode): ?>joborders<?php else: ?>candidates<?php endif; ?>&amp;a=addActivity<?php if ($this->onlyScheduleEvent): ?>&amp;onlyScheduleEvent=true<?php endif; ?>" method="post" onsubmit="return checkActivityForm(document.logActivityForm);" autocomplete="off">
+    <form name="logActivityForm" id="logActivityForm" action="<?php echo(CATSUtility::getIndexName()); ?>?m=<?php echo($this->activityParentModule); ?>&amp;a=<?php echo($this->activitySubmitAction); ?><?php if ($this->onlyScheduleEvent): ?>&amp;onlyScheduleEvent=true<?php endif; ?>" method="post" onsubmit="return checkActivityForm(document.logActivityForm);" autocomplete="off">
         <input type="hidden" name="postback" id="postback" value="postback" />
-        <input type="hidden" id="candidateID" name="candidateID" value="<?php echo($this->candidateID); ?>" />
-<?php if ($this->isJobOrdersMode): ?>
-        <input type="hidden" id="regardingID" name="regardingID" value="<?php echo($this->selectedJobOrderID); ?>" />
+        <input type="hidden" id="<?php echo($this->activityParentIDName); ?>" name="<?php echo($this->activityParentIDName); ?>" value="<?php echo($this->activityParentID); ?>" />
+<?php if ($this->activityRegardingIDHidden): ?>
+        <input type="hidden" id="regardingID" name="regardingID" value="<?php echo($this->regardingID); ?>" />
 <?php endif; ?>
 
         <table class="editTable" width="560">
@@ -63,16 +59,16 @@
                     <label id="regardingIDLabel" for="regardingID">Regarding:</label>
                 </td>
                 <td class="tdData">
-<?php if ($this->isJobOrdersMode): ?>
-                    <span><?php $this->_($this->pipelineData['title']); ?></span>
+<?php if ($this->activityRegardingIDHidden): ?>
+                    <span><?php $this->_($this->activityRegardingTitle); ?></span>
 <?php else: ?>
                     <select id="regardingID" name="regardingID" class="inputbox" style="width: 150px;">
                         <option value="-1">General</option>
-                        <?php foreach ($this->pipelineRS as $rowNumber => $pipelinesData): ?>
-                            <?php if ($this->selectedJobOrderID == $pipelinesData['jobOrderID']): ?>
-                                <option selected="selected" value="<?php $this->_($pipelinesData['jobOrderID']) ?>"><?php $this->_($pipelinesData['title']) ?></option>
+                        <?php foreach ($this->jobOrdersRS as $jobOrderData): ?>
+                            <?php if ($this->regardingID == $jobOrderData['jobOrderID']): ?>
+                                <option selected="selected" value="<?php $this->_($jobOrderData['jobOrderID']) ?>"><?php $this->_($jobOrderData['activityLabel']) ?></option>
                             <?php else: ?>
-                                <option value="<?php $this->_($pipelinesData['jobOrderID']) ?>"><?php $this->_($pipelinesData['title']) ?> (<?php $this->_($pipelinesData['companyName']) ?>)</option>
+                                <option value="<?php $this->_($jobOrderData['jobOrderID']) ?>"><?php $this->_($jobOrderData['activityLabel']) ?></option>
                             <?php endif; ?>
                         <?php endforeach; ?>
                     </select>
@@ -158,13 +154,14 @@
                                 <td valign="top">
                                     <div style="margin-bottom: 4px;">
                                         <label id="titleLabel" for="title">Title&nbsp;*</label><br />
-                                        <input type="text" class="inputbox" name="title" id="title" style="width: 180px;" />
+                                        <input type="text" class="inputbox" name="title" id="title" style="width: <?php echo($this->activityTitleWidth); ?>px" />
                                     </div>
 
+<?php if ($this->activityShowEventDuration): ?>
                                     <div style="margin-bottom: 4px;">
                                         <label id="durationLabel" for="duration">Length:</label>
                                         <br />
-                                        <select id="duration" name="duration" class="inputbox" style="width: 180px;">
+                                        <select id="duration" name="duration" class="inputbox" style="width: <?php echo($this->activityTitleWidth); ?>px;">
                                             <option value="15">15 minutes</option>
                                             <option value="30">30 minutes</option>
                                             <option value="45">45 minutes</option>
@@ -176,19 +173,20 @@
                                             <option value="300">More than 4 hours</option>
                                         </select>
                                     </div>
-                                    
+<?php endif; ?>
+
                                     <div style="margin-bottom: 4px;">
                                         <label id="descriptionLabel" for="description">Description</label><br />
-                                        <textarea name="description" id="description" cols="20" class="inputbox" style="width: 180px; height:60px;"></textarea>
+                                        <textarea name="description" id="description" cols="20" class="inputbox" style="width: <?php echo($this->activityDescriptionWidth); ?>px;<?php if ($this->activityDescriptionHeight > 0): ?> height:<?php echo($this->activityDescriptionHeight); ?>px;<?php endif; ?>"></textarea>
                                     </div>
 
                                     <div <?php if (!$this->allowEventReminders): ?>style="display:none;"<?php endif; ?>>
                                         <input type="checkbox" name="reminderToggle" onclick="if (this.checked) document.getElementById('reminderArea').style.display = ''; else document.getElementById('reminderArea').style.display = '';">&nbsp;<label>Set Reminder</label><br />
                                     </div>
-                                    
+
                                     <div style="display:none;" id="reminderArea">
                                         <div>
-                                            <label>E-Mail To:</label><br />
+                                            <label><?php echo($this->activityReminderEmailLabel); ?></label><br />
                                             <input type="text" id="sendEmail" name="sendEmail" class="inputbox" style="width: 150px" value="<?php $this->_($this->userEmail); ?>" />
                                         </div>
                                         <div>
@@ -212,11 +210,7 @@
 
         </table>
         <input type="submit" class="button" name="submit" id="submit" value="Save" />&nbsp;
-<?php if ($this->isJobOrdersMode): ?>
-        <input type="button" class="button" name="close" value="Cancel" onclick="parentGoToURL(<?php echo Template::escapeJsAttr(CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $this->selectedJobOrderID); ?>);" />
-<?php else: ?>
-        <input type="button" class="button" name="close" value="Cancel" onclick="parentGoToURL(<?php echo Template::escapeJsAttr(CATSUtility::getIndexName() . '?m=candidates&a=show&candidateID=' . $this->candidateID); ?>);" />
-<?php endif; ?>
+        <input type="button" class="button" name="close" value="Cancel" onclick="parentGoToURL(<?php echo Template::escapeJsAttr($this->activityCancelURL); ?>);" />
     </form>
 
     <script type="text/javascript">
@@ -233,13 +227,19 @@
             document.getElementById('activityMeridiem').value = (now.getHours() >= 12 ? 'PM' : 'AM');
             document.logActivityForm.activityNote.focus();
         }
+<?php if ($this->onlyScheduleEvent && $this->activityFocusEventTitle): ?>
+        else
+        {
+            document.getElementById('title').focus();
+        }
+<?php endif; ?>
     </script>
 
 <?php else: ?>
     <?php if (!$this->changesMade): ?>
         <p>No changes have been made.</p>
     <?php else: ?>
-         <?php if (!$this->onlyScheduleEvent): ?>
+        <?php if (!$this->onlyScheduleEvent): ?>
             <?php if ($this->activityAdded): ?>
                 <?php if (!empty($this->activityDescription)): ?>
                     <p>An activity entry of type <span class="bold"><?php $this->_($this->activityType); ?></span> has been added with the following note: &quot;<?php $this->_($this->activityDescription); ?>&quot;.</p>
@@ -255,11 +255,7 @@
     <?php echo($this->eventHTML); ?>
 
     <form>
-<?php if ($this->isJobOrdersMode): ?>
-        <input type="button" name="close" class="button" value="Close" onclick="parentGoToURL(<?php echo Template::escapeJsAttr(CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $this->regardingID); ?>);" />
-<?php else: ?>
-        <input type="button" name="close" class="button" value="Close" onclick="parentGoToURL(<?php echo Template::escapeJsAttr(CATSUtility::getIndexName() . '?m=candidates&a=show&candidateID=' . $this->candidateID); ?>);" />
-<?php endif; ?>
+        <input type="button" name="close" class="button" value="Close" onclick="parentGoToURL(<?php echo Template::escapeJsAttr($this->activityCloseURL); ?>);" />
     </form>
 <?php endif; ?>
 
diff --git a/modules/candidates/CandidatesUI.php b/modules/candidates/CandidatesUI.php
index 1c0c7867f..63bd9e9be 100755
--- a/modules/candidates/CandidatesUI.php
+++ b/modules/candidates/CandidatesUI.php
@@ -1793,6 +1793,10 @@ private function addActivity()
 
         $pipelines = new Pipelines($this->_siteID);
         $pipelineRS = $pipelines->getNonClosedCandidatePipeline($candidateID);
+        foreach ($pipelineRS as $rowIndex => $pipelineData)
+        {
+            $pipelineRS[$rowIndex]['activityLabel'] = $pipelineData['title'] . ' (' . $pipelineData['companyName'] . ')';
+        }
 
         /* Are we in "Only Schedule Event" mode? */
         $onlyScheduleEvent = $this->isChecked('onlyScheduleEvent', $_GET);
@@ -1812,8 +1816,26 @@ private function addActivity()
         }
 
         $this->_template->assign('candidateID', $candidateID);
+        $this->_template->assign('activityParentModule', 'candidates');
+        $this->_template->assign('activityModalTitle', 'Candidates');
+        $this->_template->assign('activityParentIDName', 'candidateID');
+        $this->_template->assign('activityParentID', $candidateID);
+        $this->_template->assign('activitySubmitAction', 'addActivity');
+        $this->_template->assign('activityValidatorPath', 'modules/candidates/activityvalidator.js');
+        $this->_template->assign('activityRegardingIDHidden', false);
+        $this->_template->assign('activityRegardingTitle', '');
+        $this->_template->assign('activityTitleWidth', 180);
+        $this->_template->assign('activityDescriptionWidth', 180);
+        $this->_template->assign('activityDescriptionHeight', 60);
+        $this->_template->assign('activityShowEventDuration', true);
+        $this->_template->assign('activityReminderEmailLabel', 'E-Mail To:');
+        $this->_template->assign('activityFocusEventTitle', false);
+        $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=candidates&a=show&candidateID=' . $candidateID);
+        $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=candidates&a=show&candidateID=' . $candidateID);
+        $this->_template->assign('jobOrdersRS', $pipelineRS);
         $this->_template->assign('pipelineRS', $pipelineRS);
         $this->_template->assign('selectedJobOrderID', $selectedJobOrderID);
+        $this->_template->assign('regardingID', $selectedJobOrderID);
         $this->_template->assign('allowEventReminders', $allowEventReminders);
         $this->_template->assign('userEmail', $_SESSION['CATS']->getEmail());
         $this->_template->assign('calendarEventTypes', $calendarEventTypes);
@@ -1821,7 +1843,7 @@ private function addActivity()
         $this->_template->assign('isFinishedMode', false);
         $this->_template->assign('isJobOrdersMode', false);
         $this->_template->display(
-            './modules/candidates/AddActivityScheduleEventModal.tpl'
+            './modules/activity/AddActivityScheduleEventModal.tpl'
         );
     }
 
@@ -3094,7 +3116,7 @@ private function _addCandidate($isModal, $directoryOverride = '')
 
     /**
      * Processes an Add Activity form and displays
-     * candidates/AddActivityScheduleEventModal.tpl.
+     * activity/AddActivityScheduleEventModal.tpl.
      *
      * @param boolean from joborders module perspective
      * @param integer "regarding" job order ID or -1
@@ -3385,6 +3407,31 @@ private function _addActivity($isJobOrdersMode, $regardingID,
         if (!eval(Hooks::get('CANDIDATE_ON_ADD_ACTIVITY_CHANGE_STATUS_POST'))) return;
 
         $this->_template->assign('candidateID', $candidateID);
+        $this->_template->assign('activityParentModule', ($isJobOrdersMode ? 'joborders' : 'candidates'));
+        $this->_template->assign('activityModalTitle', ($isJobOrdersMode ? 'Job Orders' : 'Candidates'));
+        $this->_template->assign('activityParentIDName', 'candidateID');
+        $this->_template->assign('activityParentID', $candidateID);
+        $this->_template->assign('activitySubmitAction', 'addActivity');
+        $this->_template->assign('activityValidatorPath', 'modules/candidates/activityvalidator.js');
+        $this->_template->assign('activityRegardingIDHidden', $isJobOrdersMode);
+        $this->_template->assign('activityRegardingTitle', '');
+        $this->_template->assign('activityTitleWidth', 180);
+        $this->_template->assign('activityDescriptionWidth', 180);
+        $this->_template->assign('activityDescriptionHeight', 60);
+        $this->_template->assign('activityShowEventDuration', true);
+        $this->_template->assign('activityReminderEmailLabel', 'E-Mail To:');
+        $this->_template->assign('activityFocusEventTitle', false);
+        if ($isJobOrdersMode)
+        {
+            $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $regardingID);
+            $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $regardingID);
+        }
+        else
+        {
+            $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=candidates&a=show&candidateID=' . $candidateID);
+            $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=candidates&a=show&candidateID=' . $candidateID);
+        }
+        $this->_template->assign('jobOrdersRS', array());
         $this->_template->assign('regardingID', $regardingID);
         $this->_template->assign('activityAdded', $activityAdded);
         $this->_template->assign('activityDescription', $activityNote);
@@ -3396,7 +3443,7 @@ private function _addActivity($isJobOrdersMode, $regardingID,
         $this->_template->assign('isFinishedMode', true);
         $this->_template->assign('isJobOrdersMode', $isJobOrdersMode);
         $this->_template->display(
-            './modules/candidates/AddActivityScheduleEventModal.tpl'
+            './modules/activity/AddActivityScheduleEventModal.tpl'
         );
     }
 
diff --git a/modules/contacts/AddActivityScheduleEventModal.tpl b/modules/contacts/AddActivityScheduleEventModal.tpl
deleted file mode 100755
index 0e0605ae0..000000000
--- a/modules/contacts/AddActivityScheduleEventModal.tpl
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php /* $Id: AddActivityScheduleEventModal.tpl 3093 2007-09-24 21:09:45Z brian $ */ ?>
-
-<?php if(!$this->onlyScheduleEvent): ?>
-<?php TemplateUtility::printModalHeader('Contacts', array('modules/contacts/activityvalidator.js', 'js/activity.js'), 'Contacts: Log Activity'); ?>
-<?php else: ?>
-<?php TemplateUtility::printModalHeader('Contacts', array('modules/contacts/activityvalidator.js', 'js/activity.js'), 'Contacts: Schedule Event'); ?>
-<?php endif; ?>
-
-<?php if (!$this->isFinishedMode): ?>
-
-<script type="text/javascript">
-    window.CATSUserDateFormat = '<?php echo($_SESSION['CATS']->isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY'); ?>';
-</script>
-
-    <form name="logActivityForm" id="logActivityForm" action="<?php echo(CATSUtility::getIndexName()); ?>?m=contacts&amp;a=addActivityScheduleEvent<?php if($this->onlyScheduleEvent): ?>&amp;onlyScheduleEvent=true<?php endif; ?>" method="post" onsubmit="return checkActivityForm(document.logActivityForm);" autocomplete="off">
-        <input type="hidden" name="postback" id="postback" value="postback" />
-        <input type="hidden" id="contactID" name="contactID" value="<?php echo($this->contactID); ?>" />
-
-        <table class="editTable" width="560">
-            <?php if(!$this->onlyScheduleEvent): ?>
-            <tr id="activityDateTR">
-                <td class="tdVertical">
-                    <label id="activityDateLabel" for="activityDate_Month_ID">Date:</label>
-                </td>
-                <td class="tdData">
-                    <script type="text/javascript">DateInput('activityDate', true, (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY'), '', -1);</script>
-                </td>
-            </tr>
-
-            <tr id="activityTimeTR">
-                <td class="tdVertical">
-                    <label id="activityTimeLabel" for="activityHour">Time:</label>
-                </td>
-                <td class="tdData">
-                    <select id="activityHour" name="activityHour" class="inputbox" style="width: 40px;">
-                        <?php for ($i = 1; $i <= 12; ++$i): ?>
-                            <option value="<?php echo($i); ?>"><?php echo(sprintf('%02d', $i)); ?></option>
-                        <?php endfor; ?>
-                    </select>&nbsp;
-                    <select id="activityMinute" name="activityMinute" class="inputbox" style="width: 40px;">
-                        <?php for ($i = 0; $i <= 59; ++$i): ?>
-                            <option value="<?php echo(sprintf('%02d', $i)); ?>">
-                                <?php echo(sprintf('%02d', $i)); ?>
-                            </option>
-                        <?php endfor; ?>
-                    </select>&nbsp;
-                    <select id="activityMeridiem" name="activityMeridiem" class="inputbox" style="width: 45px;">
-                        <option value="AM">AM</option>
-                        <option value="PM">PM</option>
-                    </select>
-                </td>
-            </tr>
-            <?php endif; ?>
-
-            <tr id="visibleTR" <?php if($this->onlyScheduleEvent): ?>style="display:none;"<?php endif; ?>>
-                <td class="tdVertical">
-                    <label id="regardingIDLabel" for="regardingID">Regarding:</label>
-                </td>
-                <td class="tdData">
-                    <select id="regardingID" name="regardingID" class="inputbox" style="width: 150px;">
-                        <option value="-1">General</option>
-
-                        <?php foreach ($this->regardingRS as $rowNumber => $regardingData): ?>
-                            <option value="<?php $this->_($regardingData['jobOrderID']) ?>"><?php $this->_($regardingData['title']) ?></option>
-                        <?php endforeach; ?>
-                    </select>
-                </td>
-            </tr>
-
-           <tr id="addActivityTR" <?php if($this->onlyScheduleEvent): ?>style="display:none;"<?php endif; ?>>
-                <td class="tdVertical">
-                    <label id="addActivityLabel" for="addActivity">Activity:</label>
-                </td>
-                <td class="tdData">
-                    <input type="checkbox" name="addActivity" id="addActivity" style="margin-left: 0px;" <?php if(!$this->onlyScheduleEvent): ?>checked<?php endif; ?> onclick="AS_onAddActivityChange('addActivity', 'activityTypeID', 'activityNote', 'addActivitySpanA', 'addActivitySpanB');" />Log an Activity<br />
-                    <div id="activityNoteDiv" style="margin-top: 4px;">
-                        <span id="addActivitySpanA">Activity Type</span><br />
-                        <select id="activityTypeID" name="activityTypeID" class="inputbox" style="width: 150px; margin-bottom: 4px;">
-                            <option selected="selected" value="">-- Select --</option>
-                            <option value="<?php echo(ACTIVITY_CALL); ?>">Not reached</option>
-                            <option value="<?php echo(ACTIVITY_CALL_TALKED); ?>">Call (Talked)</option>
-                            <option value="<?php echo(ACTIVITY_CALL_LVM); ?>">Call (LVM)</option>
-                            <option value="<?php echo(ACTIVITY_CALL_MISSED); ?>">Call (Missed)</option>
-                            <option value="<?php echo(ACTIVITY_EMAIL); ?>">Email</option>
-                            <option value="<?php echo(ACTIVITY_MEETING); ?>">Meeting</option>
-                            <option value="<?php echo(ACTIVITY_OTHER); ?>">Other</option>
-                        </select><br />
-                        <span id="addActivitySpanB">Activity Notes</span><br />
-                        <textarea name="activityNote" id="activityNote" cols="50" style="margin-bottom: 4px;" class="inputbox"></textarea>
-                    </div>
-                </td>
-            </tr>
-
-            <tr id="scheduleEventTR">
-                <td class="tdVertical">
-                    <label id="scheduleEventLabel" for="scheduleEvent">Schedule Event:</label>
-                </td>
-                <td class="tdData">
-                    <input type="checkbox" name="scheduleEvent" id="scheduleEvent" style="margin-left: 0px; <?php if($this->onlyScheduleEvent): ?>display:none;<?php endif; ?>" onclick="AS_onScheduleEventChange('scheduleEvent', 'scheduleEventDiv');" <?php if($this->onlyScheduleEvent): ?>checked<?php endif; ?>/><?php if(!$this->onlyScheduleEvent): ?>Schedule Event<?php endif; ?>
-                    <div id="scheduleEventDiv" style="<?php if(!$this->onlyScheduleEvent): ?>display:none;<?php endif; ?>">
-                        <table style="border: none; margin: 0px; padding: 0px;">
-                            <tr>
-                                <td valign="top">
-                                    <div style="margin-bottom: 4px;">
-                                        <select id="eventTypeID" name="eventTypeID" class="inputbox" style="width: 150px;">
-                                            <?php foreach ($this->calendarEventTypes as $eventType): ?>
-                                                <option <?php if ($eventType['typeID'] == CALENDAR_EVENT_INTERVIEW): ?>selected <?php endif; ?>value="<?php echo($eventType['typeID']); ?>"><?php $this->_($eventType['description']); ?></option>
-                                            <?php endforeach; ?>
-                                        </select>
-                                    </div>
-
-                                    <div style="margin-bottom: 4px;">
-                                        <script type="text/javascript">DateInput('dateAdd', true, (typeof window.CATSUserDateFormat !== 'undefined' ? window.CATSUserDateFormat : 'MM-DD-YY'), '', -1);</script>
-                                    </div>
-
-                                    <div style="margin-bottom: 4px;">
-                                        <input type="radio" name="allDay" id="allDay0" value="0" style="margin-left: 0px" checked onchange="AS_onEventAllDayChange('allDay1');" />
-                                        <select id="hour" name="hour" class="inputbox" style="width: 40px;">
-                                            <?php for ($i = 1; $i <= 12; ++$i): ?>
-                                                <option value="<?php echo($i); ?>"><?php echo(sprintf('%02d', $i)); ?></option>
-                                            <?php endfor; ?>
-                                        </select>&nbsp;
-                                        <select id="minute" name="minute" class="inputbox" style="width: 40px;">
-                                            <?php for ($i = 0; $i <= 45; $i = $i + 15): ?>
-                                                <option value="<?php echo(sprintf('%02d', $i)); ?>">
-                                                    <?php echo(sprintf('%02d', $i)); ?>
-                                                </option>
-                                            <?php endfor; ?>
-                                        </select>&nbsp;
-                                        <select id="meridiem" name="meridiem" class="inputbox" style="width: 45px;">
-                                            <option value="AM">AM</option>
-                                            <option value="PM">PM</option>
-                                        </select>
-                                    </div>
-
-                                    <div style="margin-bottom: 4px;">
-                                        <input type="radio" name="allDay" id="allDay1" value="1" style="margin-left: 0px" onchange="AS_onEventAllDayChange('allDay1');" />All Day / No Specific Time<br />
-                                    </div>
-
-                                    <div style="margin-bottom: 4px;">
-                                        <input type="checkBox" name="publicEntry" id="publicEntry" style="margin-left: 0px" />Public Entry
-                                    </div>
-                                </td>
-
-                                <td valign="top">
-                                    <div style="margin-bottom: 4px;">
-                                        <label id="titleLabel" for="title">Title&nbsp;*</label><br />
-                                        <input type="text" class="inputbox" name="title" id="title" style="width: 150px" />
-                                        </div>
-                                        <div style="margin-bottom: 4px;">
-                                        <label id="descriptionLabel" for="description">Description</label><br />
-                                        <textarea name="description" id="description" cols="20" class="inputbox" style="width: 150px"></textarea>
-                                    </div>
-                                    
-                                    <div <?php if (!$this->allowEventReminders): ?>style="display:none;"<?php endif; ?>>
-                                        <input type="checkbox" name="reminderToggle" onclick="if (this.checked) document.getElementById('reminderArea').style.display = ''; else document.getElementById('reminderArea').style.display = '';">&nbsp;<label>Set Reminder</label><br />
-                                    </div>
-                                    
-                                    <div style="display:none;" id="reminderArea">
-                                        <div>
-                                            <label>Email To:</label><br />
-                                            <input type="text" id="sendEmail" name="sendEmail" class="inputbox" style="width: 150px" value="<?php $this->_($this->userEmail); ?>" />
-                                        </div>
-                                        <div>
-                                            <label>Time:</label><br />
-                                            <select id="reminderTime" name="reminderTime" style="width: 150px">
-                                                <option value="15">15 min early</option>
-                                                <option value="30">30 min early</option>
-                                                <option value="45">45 min early</option>
-                                                <option value="60">1 hour early</option>
-                                                <option value="120">2 hours early</option>
-                                                <option value="1440">1 day early</option>
-                                            </select>
-                                        </div>
-                                    </div>                               
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
-                </td>
-            </tr>
-
-        </table>
-        <input type="submit" class="button" name="submit" id="submit" value="Save" />&nbsp;
-        <input type="button" class="button" name="close" value="Cancel" onclick="parentGoToURL(<?php echo Template::escapeJsAttr(CATSUtility::getIndexName() . '?m=contacts&a=show&contactID=' . $this->contactID); ?>);" />
-    </form>
-
-    <script type="text/javascript">
-        if (!<?php echo($this->onlyScheduleEvent ? 'true' : 'false'); ?>)
-        {
-            var now = new Date();
-            var currentHour = now.getHours() % 12;
-            if (currentHour == 0)
-            {
-                currentHour = 12;
-            }
-            document.getElementById('activityHour').value = currentHour.toString();
-            document.getElementById('activityMinute').value = (now.getMinutes() < 10 ? '0' : '') + now.getMinutes();
-            document.getElementById('activityMeridiem').value = (now.getHours() >= 12 ? 'PM' : 'AM');
-            document.logActivityForm.activityNote.focus();
-        }
-        else
-        {
-            document.getElementById('title').focus();
-        }
-    </script>
-
-<?php else: ?>
-    <?php if (!$this->changesMade): ?>
-        <p>No changes have been made.</p>
-    <?php else: ?>
-        <?php if(!$this->onlyScheduleEvent): ?>
-            <?php if ($this->activityAdded): ?>
-                <?php if (!empty($this->activityDescription)): ?>
-                    <p>An activity entry of type <span class="bold"><?php $this->_($this->activityType); ?></span> has been added with the following note: &quot;<?php $this->_($this->activityDescription); ?>&quot;.</p>
-                <?php else: ?>
-                    <p>An activity entry of type <span class="bold"><?php $this->_($this->activityType); ?></span> has been added with no notes.</p>
-                <?php endif; ?>
-            <?php else: ?>
-                <p>No activity entries have been added.</p>
-            <?php endif; ?>
-        <?php endif; ?>
-    <?php endif; ?>
-
-    <?php echo($this->eventHTML); ?>
-    
-    <form>
-        <input type="button" name="close" class="button" value="Close" onclick="parentGoToURL(<?php echo Template::escapeJsAttr(CATSUtility::getIndexName() . '?m=contacts&a=show&contactID=' . $this->contactID); ?>);" />
-    </form>
-<?php endif; ?>
-
-    </body>
-</html>
diff --git a/modules/contacts/ContactsUI.php b/modules/contacts/ContactsUI.php
index 929262622..b120b0fae 100755
--- a/modules/contacts/ContactsUI.php
+++ b/modules/contacts/ContactsUI.php
@@ -1107,6 +1107,10 @@ private function addActivityScheduleEvent()
         $contactData = $contacts->get($contactID);
 
         $regardingRS = $contacts->getNonClosedJobOrdersArray($contactID);
+        foreach ($regardingRS as $rowIndex => $regardingData)
+        {
+            $regardingRS[$rowIndex]['activityLabel'] = $regardingData['title'];
+        }
 
         $calendar = new Calendar($this->_siteID);
         $calendarEventTypes = $calendar->getAllEventTypes();
@@ -1126,14 +1130,32 @@ private function addActivityScheduleEvent()
         }
 
         $this->_template->assign('contactID', $contactID);
+        $this->_template->assign('activityParentModule', 'contacts');
+        $this->_template->assign('activityModalTitle', 'Contacts');
+        $this->_template->assign('activityParentIDName', 'contactID');
+        $this->_template->assign('activityParentID', $contactID);
+        $this->_template->assign('activitySubmitAction', 'addActivityScheduleEvent');
+        $this->_template->assign('activityValidatorPath', 'modules/contacts/activityvalidator.js');
+        $this->_template->assign('activityRegardingIDHidden', false);
+        $this->_template->assign('activityRegardingTitle', '');
+        $this->_template->assign('activityTitleWidth', 150);
+        $this->_template->assign('activityDescriptionWidth', 150);
+        $this->_template->assign('activityDescriptionHeight', 0);
+        $this->_template->assign('activityShowEventDuration', false);
+        $this->_template->assign('activityReminderEmailLabel', 'Email To:');
+        $this->_template->assign('activityFocusEventTitle', true);
+        $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=contacts&a=show&contactID=' . $contactID);
+        $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=contacts&a=show&contactID=' . $contactID);
         $this->_template->assign('regardingRS', $regardingRS);
+        $this->_template->assign('jobOrdersRS', $regardingRS);
+        $this->_template->assign('regardingID', -1);
         $this->_template->assign('allowEventReminders', $allowEventReminders);
         $this->_template->assign('userEmail', $_SESSION['CATS']->getEmail());
         $this->_template->assign('onlyScheduleEvent', $onlyScheduleEvent);
         $this->_template->assign('calendarEventTypes', $calendarEventTypes);
         $this->_template->assign('isFinishedMode', false);
         $this->_template->display(
-            './modules/contacts/AddActivityScheduleEventModal.tpl'
+            './modules/activity/AddActivityScheduleEventModal.tpl'
         );
     }
 
@@ -1314,7 +1336,7 @@ private function _formatListByViewResults($resultSet)
 
     /**
      * Processes an Add Activity / Schedule Event form and displays
-     * contacts/AddActivityScheduleEventModal.tpl. This is factored out
+     * activity/AddActivityScheduleEventModal.tpl. This is factored out
      * for code clarity.
      *
      * @param boolean from joborders module perspective
@@ -1601,6 +1623,23 @@ private function _addActivityScheduleEvent($regardingID, $directoryOverride = ''
         if (!eval(Hooks::get('CANDIDATE_ON_ADD_ACTIVITY_CHANGE_STATUS_POST'))) return;
 
         $this->_template->assign('contactID', $contactID);
+        $this->_template->assign('activityParentModule', 'contacts');
+        $this->_template->assign('activityModalTitle', 'Contacts');
+        $this->_template->assign('activityParentIDName', 'contactID');
+        $this->_template->assign('activityParentID', $contactID);
+        $this->_template->assign('activitySubmitAction', 'addActivityScheduleEvent');
+        $this->_template->assign('activityValidatorPath', 'modules/contacts/activityvalidator.js');
+        $this->_template->assign('activityRegardingIDHidden', false);
+        $this->_template->assign('activityRegardingTitle', '');
+        $this->_template->assign('activityTitleWidth', 150);
+        $this->_template->assign('activityDescriptionWidth', 150);
+        $this->_template->assign('activityDescriptionHeight', 0);
+        $this->_template->assign('activityShowEventDuration', false);
+        $this->_template->assign('activityReminderEmailLabel', 'Email To:');
+        $this->_template->assign('activityFocusEventTitle', true);
+        $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=contacts&a=show&contactID=' . $contactID);
+        $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=contacts&a=show&contactID=' . $contactID);
+        $this->_template->assign('jobOrdersRS', array());
         $this->_template->assign('regardingID', $regardingID);
         $this->_template->assign('activityAdded', $activityAdded);
         $this->_template->assign('activityDescription', $activityNote);
@@ -1611,7 +1650,7 @@ private function _addActivityScheduleEvent($regardingID, $directoryOverride = ''
         $this->_template->assign('changesMade', $changesMade);
         $this->_template->assign('isFinishedMode', true);
         $this->_template->display(
-            './modules/contacts/AddActivityScheduleEventModal.tpl'
+            './modules/activity/AddActivityScheduleEventModal.tpl'
         );
     }
 }
diff --git a/modules/joborders/JobOrdersUI.php b/modules/joborders/JobOrdersUI.php
index 3b1bc9361..7dad7ef3d 100755
--- a/modules/joborders/JobOrdersUI.php
+++ b/modules/joborders/JobOrdersUI.php
@@ -1511,6 +1511,24 @@ private function addActivity()
         $this->_template->assign('candidateID', $candidateID);
         $this->_template->assign('pipelineData', $pipelineData);
         $this->_template->assign('selectedJobOrderID', $jobOrderID);
+        $this->_template->assign('activityParentModule', 'joborders');
+        $this->_template->assign('activityModalTitle', 'Job Orders');
+        $this->_template->assign('activityParentIDName', 'candidateID');
+        $this->_template->assign('activityParentID', $candidateID);
+        $this->_template->assign('activitySubmitAction', 'addActivity');
+        $this->_template->assign('activityValidatorPath', 'modules/candidates/activityvalidator.js');
+        $this->_template->assign('activityRegardingIDHidden', true);
+        $this->_template->assign('activityRegardingTitle', $pipelineData['title']);
+        $this->_template->assign('activityTitleWidth', 180);
+        $this->_template->assign('activityDescriptionWidth', 180);
+        $this->_template->assign('activityDescriptionHeight', 60);
+        $this->_template->assign('activityShowEventDuration', true);
+        $this->_template->assign('activityReminderEmailLabel', 'E-Mail To:');
+        $this->_template->assign('activityFocusEventTitle', false);
+        $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $jobOrderID);
+        $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $jobOrderID);
+        $this->_template->assign('jobOrdersRS', array());
+        $this->_template->assign('regardingID', $jobOrderID);
         $this->_template->assign('calendarEventTypes', $calendarEventTypes);
         $this->_template->assign('allowEventReminders', $allowEventReminders);
         $this->_template->assign('userEmail', $_SESSION['CATS']->getEmail());
@@ -1521,7 +1539,7 @@ private function addActivity()
         if (!eval(Hooks::get('JO_ADD_ACTIVITY_CHANGE_STATUS'))) return;
 
         $this->_template->display(
-            './modules/candidates/AddActivityScheduleEventModal.tpl'
+            './modules/activity/AddActivityScheduleEventModal.tpl'
         );
     }