diff --git a/src/main/java/org/hbp/mip/MIPApplication.java b/src/main/java/org/hbp/mip/MIPApplication.java
index 35671d076319cd3f811808b8a3b43d0325c6e573..5c2e951fa8e9641554b52a88bdc928199e98a0fd 100644
--- a/src/main/java/org/hbp/mip/MIPApplication.java
+++ b/src/main/java/org/hbp/mip/MIPApplication.java
@@ -133,7 +133,6 @@ public static void main(String[] args) {
             .uniqueResult();
          if (user == null) {
             user = new User(getUserInfos());
-            user.setTeam("CHUV");
             session.save(user);
         }
          session.getTransaction().commit();
diff --git a/src/main/java/org/hbp/mip/model/User.java b/src/main/java/org/hbp/mip/model/User.java
index 4334afea9fd5e159c23711211078cd1acfd60750..e2f549d04375a1abd574dfd2d7ddfdf6c870fa14 100644
--- a/src/main/java/org/hbp/mip/model/User.java
+++ b/src/main/java/org/hbp/mip/model/User.java
@@ -90,6 +90,18 @@ public class User {
             }
         }
 
+        p = Pattern.compile("contractor=([\\w ]+)");
+        m = p.matcher(userInfo);
+        if (m.find()) {
+            this.team = m.group(1);
+        }
+
+        p = Pattern.compile("subprojects=([A-Za-z0-9\\[\\] ]+)");
+        m = p.matcher(userInfo);
+        if (m.find()) {
+            this.team += m.group(1);
+        }
+
         if (this.picture == null || this.picture.isEmpty()) {
             this.picture = "images/users/default_user.png";
         }