diff --git a/admin_aps.php b/admin_aps.php
index dcdece3c..57fb4af2 100644
--- a/admin_aps.php
+++ b/admin_aps.php
@@ -21,7 +21,6 @@
 
 define('AREA', 'admin');
 require ("./lib/init.php");
-require ("./lib/class_apsparser.php");
 $Id = 0;
 
 if(isset($_GET['id']))$Id = (int)$_GET['id'];
diff --git a/admin_message.php b/admin_message.php
index 91417d40..d0969a3e 100644
--- a/admin_message.php
+++ b/admin_message.php
@@ -47,7 +47,7 @@ if($page == 'message')
 			   && $userinfo['customers_see_all'] == '1')
 			{
 				$log->logAction(ADM_ACTION, LOG_NOTICE, "sending messages to admins");
-				$result = $db->query('SELECT `firstname`, `name`, `email`  FROM `' . TABLE_PANEL_ADMINS . "`");
+				$result = $db->query('SELECT `name`, `email`  FROM `' . TABLE_PANEL_ADMINS . "`");
 			}
 			elseif($_POST['receipient'] == 1)
 			{
@@ -78,9 +78,9 @@ if($page == 'message')
 
 				while($row = $db->fetch_array($result))
 				{
-					$mail->AddAddress($row['email'], $row['firstname'] . ' ' . $row['name']);
+					$mail->AddAddress($row['email'], (isset($row['firstname']) ? $row['firstname'] . ' ' : '') . $row['name']);
 					$mail->From = $userinfo['email'];
-					$mail->FromName = $userinfo['firstname'] . ' ' . $userinfo['name'];
+					$mail->FromName = (isset($userinfo['firstname']) ? $userinfo['firstname'] . ' ' : '') . $userinfo['name'];
 
 					if(!$mail->Send())
 					{
diff --git a/admin_tickets.php b/admin_tickets.php
index 711d2d77..4392ae8f 100644
--- a/admin_tickets.php
+++ b/admin_tickets.php
@@ -742,6 +742,7 @@ elseif($page == 'archive'
 		$ticket_replies = '';
 		$mainticket = ticket::getInstanceOf($userinfo, $db, $settings, (int)$id);
 		$lastchange = date("d.m.Y H:i\h", $mainticket->Get('lastchange'));
+		$dt = date("d.m.Y H:i\h", $mainticket->Get('dt'));
 		$status = ticket::getStatusText($lng, $mainticket->Get('status'));
 		$isclosed = 1;
 
diff --git a/lib/classes/aps/class.ApsParser.php b/lib/classes/aps/class.ApsParser.php
index 218d1bef..40811f32 100644
--- a/lib/classes/aps/class.ApsParser.php
+++ b/lib/classes/aps/class.ApsParser.php
@@ -1710,7 +1710,14 @@ class ApsParser
 			return;
 		}
 
-		$CustomerId = $this->userinfo['customerid'];
+		if(isset($this->userinfo['customerid']))
+		{		
+			$CustomerId = $this->userinfo['customerid'];
+		}
+		else
+		{
+			$CustomerId = -1;
+		}
 		$AdminId = $this->userinfo['adminid'];
 		$PackagesPerSite = $this->settings['aps']['items_per_page'];
 
diff --git a/templates/admin/admins/admins_admin.tpl b/templates/admin/admins/admins_admin.tpl
index 47c5f90e..ea3b0021 100644
--- a/templates/admin/admins/admins_admin.tpl
+++ b/templates/admin/admins/admins_admin.tpl
@@ -1,5 +1,5 @@
 <tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left<if $highlight_row>_red</if>"><if $row['adminid'] != $userinfo['userid']><a href="$filename?s=$s&amp;page=$page&amp;action=su&amp;id={$row['adminid']}" target="_blank">{$row['loginname']}</a></if><if $row['adminid'] == $userinfo['userid']>{$row['loginname']}</if></td>
+	<td class="field_name_border_left"><if $row['adminid'] != $userinfo['userid']><a href="$filename?s=$s&amp;page=$page&amp;action=su&amp;id={$row['adminid']}" target="_blank">{$row['loginname']}</a></if><if $row['adminid'] == $userinfo['userid']>{$row['loginname']}</if></td>
 	<td class="field_name">{$row['name']}</td>
 	<td class="field_name"><b><font color="green">{$row['customers_used']}</font></b>/<b><font color="#FD6204">{$row['customers']}</font></b><br /><b><font color="green">{$row['domains_used']}</font></b>/<b><font color="#FD6204">{$row['domains']}</font></b></td>
 	<td class="field_name"><b><font color="green">{$row['diskspace_used']}</font></b>/<b><font color="#FD6204">{$row['diskspace']}</font></b> (MB)<br /><b><font color="green">{$row['traffic_used']}</font></b>/<b><font color="#FD6204">{$row['traffic']}</font></b> (GB)</td>
diff --git a/templates/admin/domains/domains_domain.tpl b/templates/admin/domains/domains_domain.tpl
index 447139f8..2da71bf3 100644
--- a/templates/admin/domains/domains_domain.tpl
+++ b/templates/admin/domains/domains_domain.tpl
@@ -1,5 +1,5 @@
 <tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
-	<td class="field_name_border_left<if $highlight_row>_red</if>"><font size="-1">{$row['domain']}<if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])> ({$lng['admin']['stdsubdomain']})</if></font></td>
+	<td class="field_name_border_left"><font size="-1">{$row['domain']}<if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])> ({$lng['admin']['stdsubdomain']})</if></font></td>
 	<td class="field_name"><font size="-1">{$row['ipandport']}</font></td>
 	<td class="field_name"><font size="-1">{$row['customername']} (<a href="admin_customers.php?s=$s&amp;page=customers&amp;action=su&amp;id={$row['customerid']}" target="_blank">{$row['loginname']}</a>)</font></td>
 	<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['id']}">{$lng['panel']['edit']}</a></td>
diff --git a/templates/admin/ticket/archivesearch.tpl b/templates/admin/ticket/archivesearch.tpl
index 605a9829..cff53d62 100644
--- a/templates/admin/ticket/archivesearch.tpl
+++ b/templates/admin/ticket/archivesearch.tpl
@@ -5,23 +5,23 @@ $header
 		<input type="hidden" name="send" value="send" />
 		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
 			<tr>
-				<td class="maintitle_search_left"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['ticket']['archivesearch']}</b></td>
+				<td class="maintitle_search_left" colspan="5"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['ticket']['archivesearch']}</b></td>
 				<td class="maintitle_search_right">&nbsp;</td>
 			</tr>
-      			<if 0 < $tickets_count >
-			<tr>
-				<td class="field_display_border_left">{$lng['ticket']['archivedtime']}</td>
-				<td class="field_display">{$lng['ticket']['ticket_answers']}</td>
-				<td class="field_display">{$lng['ticket']['subject']}</td>
-				<td class="field_display">{$lng['ticket']['lastreplier']}</td>
-				<td class="field_display">{$lng['ticket']['priority']}</td>
-        			<td class="field_display_search">&nbsp;</td>
-			</tr>
-			$tickets
-      			</if>
-      			<if $tickets_count < 1 >
+      		<if 0 < $tickets_count >
+				<tr>
+					<td class="field_display_border_left">{$lng['ticket']['archivedtime']}</td>
+					<td class="field_display">{$lng['ticket']['ticket_answers']}</td>
+					<td class="field_display">{$lng['ticket']['subject']}</td>
+					<td class="field_display">{$lng['ticket']['lastreplier']}</td>
+					<td class="field_display">{$lng['ticket']['priority']}</td>
+	        		<td class="field_display_search">&nbsp;</td>
+				</tr>
+				$tickets
+      		</if>
+      		<if $tickets_count < 1 >
         		<tr>
-				<td class="field_display_border_left" colspan="2">{$lng['ticket']['noresults']}</td>
+				<td class="field_display_border_left" colspan="5">{$lng['ticket']['noresults']}</td>
 				</tr>
 			</if>
 		</table>