diff --git a/include/ajax.users.php b/include/ajax.users.php
index 459c4654286a5ad2bac46bcf1aba222caaf2f380..e298101e2f2f3bd67a65f14dc364bc00b8631614 100644
--- a/include/ajax.users.php
+++ b/include/ajax.users.php
@@ -79,8 +79,10 @@ class UsersAjaxAPI extends AjaxController {
                     'org__name__contains' => $q,
                     'account__username__contains' => $q,
                 ));
-                if (UserForm::getInstance()->getField('phone'))
+                if (UserForm::getInstance()->getField('phone')) {
+                    UserForm::ensureDynamicDataView();
                     $filter->add(array('cdata__phone__contains' => $q));
+                }
 
                 $users->filter($filter);
             }
diff --git a/include/class.forms.php b/include/class.forms.php
index 4ceee8a551ef792927dee7af022ae5dc5ecb1966..0cbabf90b238cd0fd84fb6fa71fe4bbdca9f2f83 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -4663,7 +4663,7 @@ class FreeTextField extends FormField {
 
     function to_config($config) {
         if ($config && isset($config['attachments']))
-            $keepers = $config['attachments'] = array_values($config['attachments']);
+            $keepers = $config['attachments'];
         $this->getAttachments()->keepOnlyFileIds($keepers);
 
         return $config;
diff --git a/include/class.organization.php b/include/class.organization.php
index 6d9fc030cce92468c63cbe9be2032a95aabef744..179aa2c151ad898a0f279dfb2761663d5a8fd6a0 100644
--- a/include/class.organization.php
+++ b/include/class.organization.php
@@ -489,7 +489,7 @@ implements TemplateVariable, Searchable {
         if (!$id || !$thisstaff)
             return false;
 
-        return ROOT_PATH . sprintf('orgs.php?id=%s', $id);
+        return ROOT_PATH . sprintf('scp/orgs.php?id=%s', $id);
     }
 
     static function fromVars($vars) {
diff --git a/include/class.ticket.php b/include/class.ticket.php
index d50bba7f1ed8a89d27206f7c0c9eb80581823cdc..7c6194a62df667911ec99ca6a11f7cd8b40fd1db 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -4120,7 +4120,7 @@ implements RestrictedAccess, Threadable, Searchable {
         }
 
         // Not assigned...save optional note if any
-        if (!$ticket->isAssigned() && $vars['note']) {
+        if (!$vars['assignId'] && $vars['note']) {
             if (!$cfg->isRichTextEnabled())
                 $vars['note'] = new TextThreadEntryBody($vars['note']);
             $ticket->logNote(_S('New Ticket'), $vars['note'], $thisstaff, false);
diff --git a/include/i18n/en_US/help/tips/settings.email.yaml b/include/i18n/en_US/help/tips/settings.email.yaml
index 8bd3ed3a7b636036013c911b4cf635c5c5f9e97c..cd64c71e82fe50d1750baef7ddbc26a565d9fc78 100644
--- a/include/i18n/en_US/help/tips/settings.email.yaml
+++ b/include/i18n/en_US/help/tips/settings.email.yaml
@@ -72,7 +72,7 @@ enable_autocron_fetch:
         is highly recommended for predictable fetch intervals.
     links:
       - title: Using External Task Scheduler
-        href: http://osticket.com/wiki/POP3/IMAP_Setting_Guide#Schedule_Polling
+        href: https://docs.osticket.com/en/latest/Getting%20Started/POP3-IMAP%20Settings.html
 
 strip_quoted_reply:
     title: Strip Quoted Reply
diff --git a/scp/js/scp.js b/scp/js/scp.js
index 7c0ac3b7336f927ead07c0d5f59b184ea48137f5..734cdb4cb4a73cceec16b66ce44ada1c6b56f01f 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -483,7 +483,7 @@ var scp_prep = function() {
 
   $('div.tab_content[id] div.error:not(:empty)').each(function() {
     var div = $(this).closest('.tab_content');
-    $('a[href^=#'+div.attr('id')+']').parent().addClass('error');
+    $('a[href^="#'+div.attr('id')+'"]').parent().addClass('error');
   });
 
   $('[data-toggle="tooltip"]').tooltip()