diff --git a/include/class.organization.php b/include/class.organization.php
index e1e3f44350bad64c26dcde031da2a1a2844b3eb8..3801bba3a423067dcf32bbf0c64dd92d352776c0 100644
--- a/include/class.organization.php
+++ b/include/class.organization.php
@@ -46,9 +46,12 @@ class OrganizationModel extends VerySimpleModel {
         if (!isset($this->_manager)) {
             if ($this->manager[0] == 't')
                 $this->_manager = Team::lookup(substr($this->manager, 1));
-            if ($this->manager[0] == 's')
+            elseif ($this->manager[0] == 's')
                 $this->_manager = Staff::lookup(substr($this->manager, 1));
+            else
+                $this->_manager = ''; // None.
         }
+
         return $this->_manager;
     }
 
diff --git a/include/class.team.php b/include/class.team.php
index 8d1c22bb06f90b5c9e999593c850891f3f378b61..2d79a987f70260e4778a349d946f8d80bfb6c443 100644
--- a/include/class.team.php
+++ b/include/class.team.php
@@ -52,7 +52,11 @@ class Team {
     }
 
     function asVar() {
-        return $this->getName();
+        return $this->__toString();
+    }
+
+    function __toString() {
+        return (string) $this->getName();
     }
 
     function getId() {
diff --git a/include/class.user.php b/include/class.user.php
index 083368fc6afd91b3147624d057dedd80400eee9b..89a35ab46f54b35e91a4810ffc654510e20e8e68 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -643,7 +643,7 @@ class PersonsName {
         $format = $cfg ? $cfg->getDefaultNameFormat() : 'original';
         list(,$func) = static::$formats[$format];
         if (!$func) $func = 'getFull';
-        return call_user_func(array($this, $func));
+        return (string) call_user_func(array($this, $func));
     }
 
     static function allFormats() {
diff --git a/include/staff/org-view.inc.php b/include/staff/org-view.inc.php
index 7f6403765f04af8ad4a06076136f7b7a0ae2d319..970acab915b815bae8c9dc0d1bdb91b9839c86d7 100644
--- a/include/staff/org-view.inc.php
+++ b/include/staff/org-view.inc.php
@@ -28,7 +28,7 @@ if(!defined('OSTSCPINC') || !$thisstaff || !is_object($org)) die('Invalid path')
                 </tr>
                 <tr>
                     <th>Account Manager:</th>
-                    <td>&nbsp; </td>
+                    <td><?php echo $org->getAccountManager(); ?>&nbsp;</td>
                 </tr>
             </table>
         </td>