Index: branches/UserManagement/HeuristicLab.Services.Authentication/AuthenticationService.cs
===================================================================
--- branches/UserManagement/HeuristicLab.Services.Authentication/AuthenticationService.cs	(revision 4940)
+++ branches/UserManagement/HeuristicLab.Services.Authentication/AuthenticationService.cs	(revision 4962)
@@ -52,5 +52,5 @@
         }
 
-        public bool InsertUser(User user)
+        public Guid InsertUser(User user)
         {
             if (user != null)
@@ -71,14 +71,14 @@
                     catch (Exception ex)
                     {
-                        return false;
-                    }
-
-                    return true;
-
-
-                }
-
-            }
-            return false;
+                        return Guid.Empty;
+                    }
+
+                    return user.Id;
+
+
+                }
+
+            }
+            return Guid.Empty;
         }
 
@@ -170,5 +170,5 @@
         }
 
-        public bool InsertRole(Role role)
+        public Guid InsertRole(Role role)
         {
 
@@ -188,12 +188,12 @@
                     catch (Exception ex)
                     {
-                        return false;
-                    }
-
-                    return true;
-                }
-
-            }
-            return false;
+                        return Guid.Empty;
+                    }
+
+                    return role.Id;
+                }
+
+            }
+            return Guid.Empty;
         }
 
@@ -353,5 +353,5 @@
         #region Application
 
-        public bool InsertApplication(Application application)
+        public Guid InsertApplication(Application application)
         {
             if (application != null)
@@ -370,13 +370,13 @@
                     catch (Exception ex)
                     {
-                        return false;
-                    }
-
-                    return true;
-
-                }
-
-            }
-            return false;
+                        return Guid.Empty;
+                    }
+
+                    return application.Id;
+
+                }
+
+            }
+            return Guid.Empty;
         }
 
Index: branches/UserManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.csproj
===================================================================
--- branches/UserManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.csproj	(revision 4940)
+++ branches/UserManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.csproj	(revision 4962)
@@ -51,5 +51,7 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="HeuristicLab.snk" />
   </ItemGroup>
Index: branches/UserManagement/HeuristicLab.Services.Authentication/Interfaces/IAuthenticationService.cs
===================================================================
--- branches/UserManagement/HeuristicLab.Services.Authentication/Interfaces/IAuthenticationService.cs	(revision 4940)
+++ branches/UserManagement/HeuristicLab.Services.Authentication/Interfaces/IAuthenticationService.cs	(revision 4962)
@@ -20,5 +20,5 @@
 
         [OperationContract]
-        bool InsertUser(User user);
+        Guid InsertUser(User user);
 
         [OperationContract]
@@ -50,5 +50,5 @@
 
         [OperationContract]
-        bool InsertRole(Role role);
+        Guid InsertRole(Role role);
 
         [OperationContract]
@@ -69,5 +69,5 @@
 
         [OperationContract]
-        bool InsertApplication(Application application);
+        Guid InsertApplication(Application application);
 
         [OperationContract]
@@ -77,4 +77,8 @@
         IEnumerable<DataTransfer.Application> GetApplications();
 
+
+        [OperationContract]
+        bool UpdateApplication(Application application);
+
         #endregion
 
Index: branches/UserManagement/HeuristicLab.Services.Authentication/app.config
===================================================================
--- branches/UserManagement/HeuristicLab.Services.Authentication/app.config	(revision 4940)
+++ branches/UserManagement/HeuristicLab.Services.Authentication/app.config	(revision 4962)
@@ -28,17 +28,6 @@
   <system.serviceModel>
     <bindings>
-      <netTcpBinding>
-        <binding name="DefaultNetTcpBinding" openTimeout="00:00:30" receiveTimeout="00:00:30"
-          sendTimeout="00:00:30" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647">
-          <readerQuotas maxArrayLength="2147483647" />
-          <reliableSession inactivityTimeout="00:00:30" enabled="false" />
-          <security mode="Message">
-            <message clientCredentialType="UserName" />
-          </security>
-        </binding>
-      </netTcpBinding>
       <wsHttpBinding>
-        <binding name="DefaultWsHttpBinding" maxReceivedMessageSize="200000000">
-          <readerQuotas maxArrayLength="200000000" maxBytesPerRead="200000000" />
+        <binding name="DefaultWSHttpBinding">
           <security mode="Message">
             <message clientCredentialType="UserName" />
@@ -46,19 +35,22 @@
         </binding>
       </wsHttpBinding>
+
       <mexHttpBinding>
-        <binding name="DefaultMexHttpBinding" />
+        <binding name="DefaultMexBinding" />
       </mexHttpBinding>
     </bindings>
 
-    
+
     <behaviors>
       <serviceBehaviors>
-        <behavior name="DefaultServiceBehavior">
+        <behavior name="DefaultBehavior">
           <serviceMetadata httpGetEnabled="true" />
           <serviceDebug includeExceptionDetailInFaults="true" />
-          <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider" />
+          <serviceAuthorization principalPermissionMode="UseAspNetRoles"
+            roleProviderName="AspNetSqlRoleProvider" />
           <serviceCredentials>
             <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
-            <userNameAuthentication  userNamePasswordValidationMode="Windows" />
+            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
+              membershipProviderName="AspNetSqlMembershipProvider" />
           </serviceCredentials>
         </behavior>
@@ -67,16 +59,11 @@
 
     <services>
-      <service behaviorConfiguration="DefaultServiceBehavior" name="HeuristicLab.Services.Authentication.AuthenticationService">
-        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding"
-          name="mexHttpBinding" contract="IMetadataExchange">
-          <identity>
-            <certificate encodedValue="AwAAAAEAAAAUAAAAD/AlkYJw/OUhl6D/9w8mjJBh39kgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMDIyMzIwOFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPkfCSLRX8/4F+Z4ys43yZ4MMzjB44cMakPz4Nri+mEB5n2z/0GFatCYzkI2f/nniWqVrBYjHkjsZy2EZioHu4wa99c1XEGJnFNDuNn6ESkfEyhyF4+OqKGnpK9HNrw7OWMuqn2oOh0iFd9fl6FTAm+Y0p3LP+38BuYzpCniqqdwIDAQABo0kwRzBFBgNVHQEEPjA8gBDvi8Rgio9v+mr58TiAvqF5oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQADgYEANdGlvHKeUptfNu9I0wgA5qjmVB+JDldOAkrfM0R+4IcVQ06y5K7P07uxQAV7+rhnDLgLyFJunUHgzbfjsjFy7vjwtoieXA5j0AYlm4AHR7dHt4HVgkIMYt8XOCqMw5jjFX91xJ89tC7mM9zYR48N9T5QSeMGo+f+JzybeLWxnNs=" />
-          </identity>
+      <service behaviorConfiguration="DefaultBehavior" name="HeuristicLab.Services.Authentication.AuthenticationService">
+        <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWSHttpBinding"
+          contract="HeuristicLab.Services.Authentication.IAuthenticationService" listenUriMode="Explicit">
         </endpoint>
-        <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
-          name="wsHttpBinding" contract="HeuristicLab.Services.Authentication.IAuthenticationService">
-          <identity>
-            <certificate encodedValue="AwAAAAEAAAAUAAAAD/AlkYJw/OUhl6D/9w8mjJBh39kgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMDIyMzIwOFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPkfCSLRX8/4F+Z4ys43yZ4MMzjB44cMakPz4Nri+mEB5n2z/0GFatCYzkI2f/nniWqVrBYjHkjsZy2EZioHu4wa99c1XEGJnFNDuNn6ESkfEyhyF4+OqKGnpK9HNrw7OWMuqn2oOh0iFd9fl6FTAm+Y0p3LP+38BuYzpCniqqdwIDAQABo0kwRzBFBgNVHQEEPjA8gBDvi8Rgio9v+mr58TiAvqF5oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQADgYEANdGlvHKeUptfNu9I0wgA5qjmVB+JDldOAkrfM0R+4IcVQ06y5K7P07uxQAV7+rhnDLgLyFJunUHgzbfjsjFy7vjwtoieXA5j0AYlm4AHR7dHt4HVgkIMYt8XOCqMw5jjFX91xJ89tC7mM9zYR48N9T5QSeMGo+f+JzybeLWxnNs=" />
-          </identity>
+        
+        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexBinding"
+          contract="IMetadataExchange" listenUriMode="Explicit">
         </endpoint>
         <host>
@@ -87,4 +74,5 @@
       </service>
     </services>
+    
   </system.serviceModel>
 
