diff --git a/opt/gemeinschaft/etc/asterisk/e-gategroups-in.ael.php b/opt/gemeinschaft/etc/asterisk/e-gategroups-in.ael.php
index 0d3a48eed..0d41a5571 100755
--- a/opt/gemeinschaft/etc/asterisk/e-gategroups-in.ael.php
+++ b/opt/gemeinschaft/etc/asterisk/e-gategroups-in.ael.php
@@ -69,7 +69,12 @@
 		echo "\t\t\t\t", 'WaitExten(1);' ,"\n";
 		echo "\t\t\t", '}' ,"\n";
 		
-		echo "\t\t\t", 'Set(did_full=${EXTEN});' ,"\n";
+		if (preg_match('/\bpbx\-network\b/i', $name)) {
+                        // PBX Network hack
+                        echo "\t\t\t", 'Set(did_full=${CUT(CUT(SIP_HEADER(P-Called-Party-ID),:,2),@,1)});', "\n";
+                } else {
+                        echo "\t\t\t", 'Set(did_full=${EXTEN});' ,"\n";
+                }
 		
 		/*
 		# hack for Sipgate.de {
@@ -125,4 +130,4 @@
 echo '// end of contexts for incoming calls from the gateway groups' ,"\n";
 echo "\n";
 
-?>
\ No newline at end of file
+?>
diff --git a/opt/gemeinschaft/etc/asterisk/e-internal.ael b/opt/gemeinschaft/etc/asterisk/e-internal.ael
index 41e8b8883..2c6e0a129 100644
--- a/opt/gemeinschaft/etc/asterisk/e-internal.ael
+++ b/opt/gemeinschaft/etc/asterisk/e-internal.ael
@@ -1021,7 +1021,8 @@ context to-internal-users-self {
 			
 			//Set(CALLERID(name)=Queue ${EXTEN});
 			//Set(CALLERID(name)=Q${EXTEN} ${CALLERID(name)});
-			SetCallerPres(allowed_passed_screen);
+			Set(CALLERID(name-pres)=allowed_passed_screen);
+                        Set(CALLERID(num-pres)=allowed_passed_screen);
 			Set(CALLERID(name)=[${queue_displayname}] ${CALLERID(name)});
 			if ("${CALLERID(num)}" = "")
 				Set(CALLERID(num)=${EXTEN});
diff --git a/opt/gemeinschaft/htdocs/gui/mod/routing_gws-sip.php b/opt/gemeinschaft/htdocs/gui/mod/routing_gws-sip.php
index f09a6f983..53f2e1a9a 100644
--- a/opt/gemeinschaft/htdocs/gui/mod/routing_gws-sip.php
+++ b/opt/gemeinschaft/htdocs/gui/mod/routing_gws-sip.php
@@ -311,7 +311,7 @@ function confirm_delete() {
 	echo '<tr class="m">',"\n";
 	echo '<th>', __('Benutzername') ,' <sup>[2]</sup>:</th>',"\n";
 	echo '<td>',"\n";
-	echo '<input type="text" name="gw-user" value="', htmlEnt($gw['user']) ,'" size="25" maxlength="35" style="width:97%;" />',"\n";
+	echo '<input type="text" name="gw-user" value="', htmlEnt($gw['user']) ,'" size="25" maxlength="50" style="width:97%;" />',"\n";
 	echo '</td>',"\n";
 	echo '<td class="transp xs gray"><code>username / fromuser@fromdomain</code></td>',"\n";
 	echo '</tr>',"\n";