diff --git a/.gitignore b/.gitignore
index 83d45fb1..1aafcd90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -241,7 +241,6 @@ inc/tiny_mce/3.5.11/utils/mctabs.js
 inc/tiny_mce/3.5.11/utils/validate.js
 inc/treemenu/TreeMenu.php
 inc/treemenu/index.htm
-inc/users_online.inc.php
 inc/zip/Zip.php
 inc/zip/index.htm
 inc/zip/pclzip.lib.php
diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css
index 72c974fa..fdf5f5b5 100644
--- a/css/mods-for-hesk-new.css
+++ b/css/mods-for-hesk-new.css
@@ -265,4 +265,8 @@ div.ticket-info {
 .box-header h1.box-title {
     width: 100%;
     cursor: pointer;
+}
+
+.black {
+    color: black;
 }
\ No newline at end of file
diff --git a/inc/footer.inc.php b/inc/footer.inc.php
index 9d50c8a9..e7c6c02d 100644
--- a/inc/footer.inc.php
+++ b/inc/footer.inc.php
@@ -43,12 +43,6 @@ if (defined('AUTOFOCUS'))
 <?php
 }
 
-// Users online
-if (defined('SHOW_ONLINE'))
-{
-	hesk_printOnline();
-}
-
 // The closing div here is to close the content area on each page. Annoying, but necessary.
 if (defined('ADMIN_PAGE')) {
 	echo '
diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php
index d1598dc9..d387cf36 100644
--- a/inc/show_admin_nav.inc.php
+++ b/inc/show_admin_nav.inc.php
@@ -188,7 +188,14 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
                                 </li>
                             </ul>
                         </li>
-                    <?php endif; ?>
+                    <?php
+                    endif;
+
+                    // Users online
+                    if (defined('SHOW_ONLINE')) {
+                        hesk_printOnline();
+                    }
+                    ?>
                     <li class="dropdown messages-menu">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                             <i class="fa fa-envelope-o"></i>
diff --git a/inc/users_online.inc.php b/inc/users_online.inc.php
new file mode 100755
index 00000000..1e6fd75c
--- /dev/null
+++ b/inc/users_online.inc.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * http://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * http://www.hesk.com/eula.php
+ *
+ */
+
+/* Check if this is a valid include */
+if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
+
+
+function hesk_initOnline($user_id)
+{
+	global $hesk_settings, $hesklang;
+
+    /* Set user to online */
+	hesk_setOnline($user_id);
+
+    /* Can this user view online staff? */
+    if (hesk_checkPermission('can_view_online',0))
+    {
+    	$hesk_settings['users_online'] = hesk_listOnline();
+        define('SHOW_ONLINE',1);
+    }
+
+    return true;
+} // END hesk_initOnline()
+
+
+function hesk_printOnline() {
+	global $hesk_settings, $hesklang;
+    ?>
+    <li class="dropdown messages-menu">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+            <i class="fa fa-users"></i>
+            <span class="label label-danger"><?php echo count($hesk_settings['users_online']); ?></span>
+        </a>
+        <ul class="dropdown-menu">
+            <li class="header"><?php echo $hesklang['onlinep']; ?></li>
+            <li>
+                <ul class="menu">
+                    <?php foreach ($hesk_settings['users_online'] as $tmp): ?>
+                        <li>
+                            <?php $link = ($tmp['id'] == $_SESSION['id']) ? '' : ' href="mail.php?a=new&id='.$tmp['id'].'"'; ?>
+                            <a<?php echo $link; ?>>
+                                <div class="pull-left">
+                                    <i class="fa fa-user fa-2x black"></i>
+                                </div>
+                                <h4><?php echo $tmp['name']; ?></h4>
+                                <?php
+                                if ($tmp['isadmin']): ?>
+                                    <p>
+                                        <span class="label label-default">
+                                            <?php echo $hesklang['administrator']; ?>
+                                        </span>
+                                    </p>
+                                <?php elseif ($tmp['id'] == $_SESSION['id']): ?>
+                                    <!--<span class="badge badge-default">You</span>-->
+                                <?php endif; ?>
+                            </a>
+                        </li>
+                    <?php endforeach; ?>
+                </ul>
+            </li>
+        </ul>
+    </li>
+<?php
+} // END hesk_printOnline()
+
+
+function hesk_listOnline($list_names=1)
+{
+	global $hesk_settings, $hesklang, $hesk_db_link;
+
+    $users_online = array();
+
+    /* Clean expired entries */
+    hesk_cleanOnline();
+
+    /* Get a list of online users */
+    /* --> With names */
+    if ($list_names)
+    {
+        $res = hesk_dbQuery("SELECT `t1`.`user_id` , `t2`.`name` , `t2`.`isadmin` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."online` AS `t1` INNER JOIN `".hesk_dbEscape($hesk_settings['db_pfix'])."users` AS `t2` ON `t1`.`user_id` = `t2`.`id`");
+		while ($tmp = hesk_dbFetchAssoc($res))
+        {
+        	$users_online[$tmp['user_id']] = array(
+            	'id'		=> $tmp['user_id'],
+                'name'		=> $tmp['name'],
+                'isadmin'	=> $tmp['isadmin']
+            );
+        }
+    }
+    /* --> Without names */
+    else
+    {
+        $res = hesk_dbQuery("SELECT `user_id` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."online`");
+		while ($tmp = hesk_dbFetchAssoc($res))
+        {
+        	$users_online[] = $tmp['user_id'];
+        }
+    }
+
+    return $users_online;
+
+} // END hesk_listOnline()
+
+
+function hesk_setOnline($user_id)
+{
+	global $hesk_settings, $hesklang, $hesk_db_link;
+
+    /* If already online just update... */
+    hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."online` SET `tmp` = `tmp` + 1 WHERE `user_id` = '".intval($user_id)."'");
+
+	/* ... else insert a new entry */
+    if ( ! hesk_dbAffectedRows() )
+    {
+	    hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."online` (`user_id`) VALUES (".intval($user_id).") ");
+    }
+
+    return true;
+
+} // END hesk_setOnline()
+
+
+function hesk_setOffline($user_id)
+{
+	global $hesk_settings, $hesklang, $hesk_db_link;
+
+    /* If already online just update... */
+    hesk_dbQuery("DELETE FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."online` WHERE `user_id` = '".intval($user_id)."'");
+
+    return true;
+
+} // END hesk_setOffline()
+
+
+function hesk_cleanOnline()
+{
+	global $hesk_settings, $hesklang, $hesk_db_link;
+
+    /* Delete old rows from the database */
+    hesk_dbQuery("DELETE FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."online` WHERE `dt` < ( NOW() - INTERVAL ".intval($hesk_settings['online_min'])." MINUTE) ");
+
+	return true;
+} // END hesk_cleanOnline()