diff --git a/locallib.php b/locallib.php
index 0ec06ef7d57dc5b743fad2df759f9ce78a99dd5c..7dba24e1aa56aab52771b1189b3510c1f02bcf8d 100644
--- a/locallib.php
+++ b/locallib.php
@@ -173,11 +173,12 @@ function adobe_connection_test($host = '', $port = 80, $username = '',
                     echo '<p style="color:#680000">XML response:<br />'. htmlspecialchars($aconnectDOM->_xmlresponse). '</p>';
                 }
 		
-		// DFNVC
+                // DFNVC
                 // Test creating a meeting
-		//
+                //
                 echo '<p><b>Test creating a meeting:</b></p>';
-		list($dummy, $testdomain) = split('@',$username);
+                $res = preg_split('/@/',$username);
+                $testdomain = $res[1];
 
                 $meeting = new stdClass();
                 $meeting->name = "MoodleTestMeeting for $testdomain";
@@ -207,14 +208,16 @@ function adobe_connection_test($host = '', $port = 80, $username = '',
                     echo '<p style="color:#680000">XML response:<br />'. htmlspecialchars($aconnectDOM->_xmlresponse). '</p>';		    
 		}
 
-                // Test creating a user
+        // Test creating a user
 		// DFNVC
 		//
                 echo '<p><b>Test creating a user:</b></p>';		
                 $user = new stdClass();
-		list($dummy, $apiuserdomain) = split('@',$username);
+                $res = preg_split('/@/',$username);
+                $apiuserdomain = $res[1];
+                
                 $user->email = 'MoodleTestUser@' . $apiuserdomain;
-		$user->username = $user->email;
+                $user->username = $user->email;
                 $user->firstname = 'Moodle Test User';
                 $user->lastname = 'GROUP';