--- main.js-	2013-08-05 16:04:04.000000000 +0200
+++ main.js	2013-09-05 13:26:19.000000000 +0200
@@ -671,22 +671,20 @@
 	globalSettings.TodoListFilterSelected.splice(0, globalSettings.TodoListFilterSelected.length);
 
 	if(typeof isCalDAVAvaible!='undefined' && isCalDAVAvaible!=null && isCalDAVAvaible)
 	{
 		for(var i=0;i<vR.length;i++)
 		{
-			var uidPart=vR[i].match(RegExp('^(https?://)(.*)', 'i'))[1];
-			var uidPart2= vR[i].match(RegExp('^(https?://)(.*)', 'i'))[2].split('@')[2];
-			globalSettings.inactiveCollections.splice(globalSettings.inactiveCollections.length , 0, uidPart+uidPart2);
+			var uidParts=vR[i].match(RegExp('^(https?://)([^@/]+(?:@[^@/]+)?)@(.*)'))
+			globalSettings.inactiveCollections.splice(globalSettings.inactiveCollections.length , 0, uidParts[1]+uidParts[3]);
 		}
 
 		for(var i=0;i<vRTodo.length;i++)
 		{
-			var uidPart=vRTodo[i].match(RegExp('^(https?://)(.*)', 'i'))[1];
-			var uidPart2= vRTodo[i].match(RegExp('^(https?://)(.*)', 'i'))[2].split('@')[2];
-			globalSettings.inactiveTodoCollections.splice(globalSettings.inactiveTodoCollections.length , 0, uidPart+uidPart2);
+			var uidParts=vRTodo[i].match(RegExp('^(https?://)([^@/]+(?:@[^@/]+)?)@(.*)'));
+			globalSettings.inactiveTodoCollections.splice(globalSettings.inactiveTodoCollections.length , 0, uidParts[1]+uidParts[3]);
 		}
 
 		var view= $('#calendar').fullCalendar('getView');
 		globalSettings.activeView=view.name;
 		
 		globalSettings.currentDate=view.start.getFullYear()+'-'+(view.start.getMonth()+1)+'-'+view.start.getDate();