diff --git a/admin_customers.php b/admin_customers.php
index ae7208db..67a02600 100644
--- a/admin_customers.php
+++ b/admin_customers.php
@@ -197,7 +197,11 @@ if ($page == 'customers'
 			WHERE `customerid` = :id" .
 			($userinfo['customers_see_all'] ? '' : " AND `adminid` = :adminid")
 		);
-		$result = Database::pexecute_first($result_stmt, array('id' => $id, 'adminid' => $userinfo['adminid']));
+		$result_data = array('id' => $id);
+		if ($userinfo['customers_see_all'] == '0') {
+			$result_data['adminid'] = $userinfo['adminid'];
+		}
+		$result = Database::pexecute_first($result_stmt, $result_data);
 
 		if ($result['loginname'] != '') {
 
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index b466532f..c2d61e4e 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -2574,8 +2574,14 @@ if (isFroxlorVersion('0.9.31')) {
 }
 
 if (isFroxlorVersion('0.9.31.1')) {
+        showUpdateStep("Updating from 0.9.31.1 to 0.9.31.2 final", true);
+        lastStepStatus(0);
+        updateToVersion('0.9.31.2');
+}
 
-	showUpdateStep("Updating from 0.9.31.1 to 0.9.32-dev1");
+if (isFroxlorVersion('0.9.31.2')) {
+
+	showUpdateStep("Updating from 0.9.31.2 to 0.9.32-dev1");
 	lastStepStatus(0);
 
 	showUpdateStep("Removing APS-module (deprecated)");
diff --git a/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf
index 249b9280..8812759d 100644
--- a/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf
+++ b/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf
@@ -1,4 +1,4 @@
-#protocols = imap pop3 <SSLPROTOCOLS>
+protocols = imap pop3 <SSLPROTOCOLS>
 listen = *
 mail_access_groups = vmail
 mail_debug = no
diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf
index 056da607..18f38058 100644
--- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf
+++ b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf
@@ -4,7 +4,7 @@
 
 # Address to use when sending rejection mails.
 # Default is postmaster@<your domain>.
-#postmaster_address = postmaster@<SERVERNAME>
+postmaster_address = postmaster@<SERVERNAME>
 
 # Hostname to use in various parts of sent mails, eg. in Message-Id.
 # Default is the system's real hostname.