diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5fa1dc0..c11e6f6 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -3,23 +3,21 @@
   <component name="CompilerConfiguration">
     <annotationProcessing>
       <profile default="true" name="Default" enabled="true" />
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="discovery-service" />
-      </profile>
-      <profile name="Annotation profile for workflow-service" enabled="true">
+      <profile name="Annotation profile for auth-service" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <processorPath useClasspath="false">
           <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.46/lombok-1.18.46.jar" />
         </processorPath>
-        <module name="worker-service" />
-        <module name="api-gateway" />
         <module name="auth-service" />
       </profile>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="discovery-service" />
+      </profile>
       <profile name="Annotation profile for workflow-service" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
@@ -28,11 +26,12 @@
           <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.46/lombok-1.18.46.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.46/lombok-1.18.46.jar" />
         </processorPath>
+        <module name="api-gateway" />
         <module name="workflow-service" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="woker-service" target="21" />
+      <module name="worker-service" target="21" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
@@ -40,8 +39,6 @@
       <module name="api-gateway" options="-parameters" />
       <module name="auth-service" options="-parameters" />
       <module name="discovery-service" options="-parameters" />
-      <module name="woker-service" options="-parameters" />
-      <module name="worker-service" options="-parameters" />
       <module name="workflow-service" options="-parameters" />
     </option>
   </component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 631399c..ff2cf90 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/flowforge.iml" filepath="$PROJECT_DIR$/.idea/flowforge.iml" />
-      <module fileurl="file://$PROJECT_DIR$/workflow-service/workflow-service.iml" filepath="$PROJECT_DIR$/workflow-service/workflow-service.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/auth-service/src/main/java/com/flowforge/auth_service/model/Invitation.java b/auth-service/src/main/java/com/flowforge/auth_service/model/Invitation.java
index efebfd9..80ff70e 100644
--- a/auth-service/src/main/java/com/flowforge/auth_service/model/Invitation.java
+++ b/auth-service/src/main/java/com/flowforge/auth_service/model/Invitation.java
@@ -23,7 +23,7 @@ public class Invitation {
 
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
-    private String id;
+    private UUID id;
 
     @Column(nullable = false,unique = true)
     private String token;
diff --git a/auth-service/src/main/java/com/flowforge/auth_service/model/Organization.java b/auth-service/src/main/java/com/flowforge/auth_service/model/Organization.java
index 0e48a4f..65c55a6 100644
--- a/auth-service/src/main/java/com/flowforge/auth_service/model/Organization.java
+++ b/auth-service/src/main/java/com/flowforge/auth_service/model/Organization.java
@@ -10,6 +10,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import java.util.UUID;
+
 @Entity
 @Table(name = "organizations")
 @Data
@@ -18,7 +20,7 @@
 public class Organization {
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
-    private String id;
+    private UUID id;
 
     @Column(nullable = false, unique = true)
     private String name;
diff --git a/auth-service/src/main/java/com/flowforge/auth_service/model/User.java b/auth-service/src/main/java/com/flowforge/auth_service/model/User.java
index c123f0f..359fc60 100644
--- a/auth-service/src/main/java/com/flowforge/auth_service/model/User.java
+++ b/auth-service/src/main/java/com/flowforge/auth_service/model/User.java
@@ -10,6 +10,8 @@
 
 import java.time.Instant;
 
+import java.util.UUID;
+
 @Entity
 @Table(name = "users")
 @Data
@@ -20,7 +22,7 @@ public class User {
 
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
-    private String id;
+    private UUID id;
 
     @Column(nullable = false)
     private String fullName;
diff --git a/auth-service/src/main/java/com/flowforge/auth_service/repository/InvitationRepository.java b/auth-service/src/main/java/com/flowforge/auth_service/repository/InvitationRepository.java
index 19bcd98..9ff1071 100644
--- a/auth-service/src/main/java/com/flowforge/auth_service/repository/InvitationRepository.java
+++ b/auth-service/src/main/java/com/flowforge/auth_service/repository/InvitationRepository.java
@@ -10,8 +10,10 @@
 import java.time.Instant;
 import java.util.Optional;
 
+import java.util.UUID;
+
 @Repository
-public interface InvitationRepository extends JpaRepository<Invitation,String> {
+public interface InvitationRepository extends JpaRepository<Invitation,UUID> {
 
     Optional<Invitation> findByToken(String token);
 
diff --git a/auth-service/src/main/java/com/flowforge/auth_service/repository/OrganizationRepository.java b/auth-service/src/main/java/com/flowforge/auth_service/repository/OrganizationRepository.java
index 423d8e3..453eed4 100644
--- a/auth-service/src/main/java/com/flowforge/auth_service/repository/OrganizationRepository.java
+++ b/auth-service/src/main/java/com/flowforge/auth_service/repository/OrganizationRepository.java
@@ -3,6 +3,8 @@
 import com.flowforge.auth_service.model.Organization;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface OrganizationRepository extends JpaRepository<Organization,String> {
+import java.util.UUID;
+
+public interface OrganizationRepository extends JpaRepository<Organization,UUID> {
     boolean existsByName(String name);
 }
diff --git a/auth-service/src/main/java/com/flowforge/auth_service/repository/UserRepository.java b/auth-service/src/main/java/com/flowforge/auth_service/repository/UserRepository.java
index 2c84c5a..b4a97bd 100644
--- a/auth-service/src/main/java/com/flowforge/auth_service/repository/UserRepository.java
+++ b/auth-service/src/main/java/com/flowforge/auth_service/repository/UserRepository.java
@@ -6,7 +6,9 @@
 
 import java.util.Optional;
 
-public interface UserRepository extends JpaRepository<User,String> {
+import java.util.UUID;
+
+public interface UserRepository extends JpaRepository<User,UUID> {
     @EntityGraph(attributePaths = {"organization"})
     Optional<User> findByEmail(String email);
 
diff --git a/auth-service/src/main/java/com/flowforge/auth_service/security/JwtService.java b/auth-service/src/main/java/com/flowforge/auth_service/security/JwtService.java
index 5f66695..fb3e38d 100644
--- a/auth-service/src/main/java/com/flowforge/auth_service/security/JwtService.java
+++ b/auth-service/src/main/java/com/flowforge/auth_service/security/JwtService.java
@@ -25,8 +25,8 @@ private SecretKey key(){
     public String generateAccessToken(User user){
         return Jwts.builder()
                 .setSubject(user.getEmail())
-                .claim("userId", user.getId())
-                .claim("orgId", user.getOrganization().getId())
+                .claim("userId", user.getId().toString())
+                .claim("orgId", user.getOrganization().getId().toString())
                 .claim("role", user.getRole().name())
                 .setIssuedAt(new Date())
                 .setExpiration(new Date(System.currentTimeMillis() + 900_000L))
diff --git a/auth-service/src/main/java/com/flowforge/auth_service/security/UserPrincipal.java b/auth-service/src/main/java/com/flowforge/auth_service/security/UserPrincipal.java
index dd2216a..13d9971 100644
--- a/auth-service/src/main/java/com/flowforge/auth_service/security/UserPrincipal.java
+++ b/auth-service/src/main/java/com/flowforge/auth_service/security/UserPrincipal.java
@@ -8,12 +8,13 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.UUID;
 
 public class UserPrincipal implements UserDetails {
 
-    private final String id;
+    private final UUID id;
     private final String email;
-    private final String organizationId;
+    private final UUID organizationId;
     private final Role role;
 
     public UserPrincipal(User user){
@@ -37,10 +38,10 @@ public String getPassword() {
     public String getUsername() {
         return email;
     }
-    public String getId() {
+    public UUID getId() {
         return id;
     }
-    public String getOrganizationId() {
+    public UUID getOrganizationId() {
         return organizationId;
     }
 }
diff --git a/auth-service/src/main/java/com/flowforge/auth_service/service/OrganizationService.java b/auth-service/src/main/java/com/flowforge/auth_service/service/OrganizationService.java
index 2a60a4c..9f15193 100644
--- a/auth-service/src/main/java/com/flowforge/auth_service/service/OrganizationService.java
+++ b/auth-service/src/main/java/com/flowforge/auth_service/service/OrganizationService.java
@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.Optional;
+import java.util.UUID;
 
 @Service
 @RequiredArgsConstructor
@@ -16,7 +17,7 @@ public Organization save(Organization organization){
         return organizationRepository.save(organization);
     }
 
-    public Optional<Organization> findById(String id){
+    public Optional<Organization> findById(UUID id){
         return organizationRepository.findById(id);
     }
 
diff --git a/auth-service/target/auth-service-0.0.1-SNAPSHOT.jar b/auth-service/target/auth-service-0.0.1-SNAPSHOT.jar
deleted file mode 100644
index 8d9ae0b..0000000
Binary files a/auth-service/target/auth-service-0.0.1-SNAPSHOT.jar and /dev/null differ
diff --git a/auth-service/target/auth-service-0.0.1-SNAPSHOT.jar.original b/auth-service/target/auth-service-0.0.1-SNAPSHOT.jar.original
deleted file mode 100644
index fc8f38c..0000000
Binary files a/auth-service/target/auth-service-0.0.1-SNAPSHOT.jar.original and /dev/null differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/AuthServiceApplication.class b/auth-service/target/classes/com/flowforge/auth_service/AuthServiceApplication.class
index e918d02..389212b 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/AuthServiceApplication.class and b/auth-service/target/classes/com/flowforge/auth_service/AuthServiceApplication.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/config/PasswordEncoderConfig.class b/auth-service/target/classes/com/flowforge/auth_service/config/PasswordEncoderConfig.class
index 16c75ff..824d934 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/config/PasswordEncoderConfig.class and b/auth-service/target/classes/com/flowforge/auth_service/config/PasswordEncoderConfig.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/config/SwaggerConfig.class b/auth-service/target/classes/com/flowforge/auth_service/config/SwaggerConfig.class
index 3b58a69..7f337a6 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/config/SwaggerConfig.class and b/auth-service/target/classes/com/flowforge/auth_service/config/SwaggerConfig.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/controller/AuthenticationController.class b/auth-service/target/classes/com/flowforge/auth_service/controller/AuthenticationController.class
index a1c6258..6a7e981 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/controller/AuthenticationController.class and b/auth-service/target/classes/com/flowforge/auth_service/controller/AuthenticationController.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/controller/InvitationController.class b/auth-service/target/classes/com/flowforge/auth_service/controller/InvitationController.class
index a6bb925..9558195 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/controller/InvitationController.class and b/auth-service/target/classes/com/flowforge/auth_service/controller/InvitationController.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/ApiResponse$ApiResponseBuilder.class b/auth-service/target/classes/com/flowforge/auth_service/dto/ApiResponse$ApiResponseBuilder.class
index d3257f0..767e570 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/ApiResponse$ApiResponseBuilder.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/ApiResponse$ApiResponseBuilder.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/ApiResponse.class b/auth-service/target/classes/com/flowforge/auth_service/dto/ApiResponse.class
index cb1f7cf..50ea0b2 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/ApiResponse.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/ApiResponse.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/AuthResponse$AuthResponseBuilder.class b/auth-service/target/classes/com/flowforge/auth_service/dto/AuthResponse$AuthResponseBuilder.class
index 482e560..cc01d56 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/AuthResponse$AuthResponseBuilder.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/AuthResponse$AuthResponseBuilder.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/AuthResponse.class b/auth-service/target/classes/com/flowforge/auth_service/dto/AuthResponse.class
index 6477348..dacdecf 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/AuthResponse.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/AuthResponse.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationRequest$CreateInvitationRequestBuilder.class b/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationRequest$CreateInvitationRequestBuilder.class
index 9a3023a..41b540a 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationRequest$CreateInvitationRequestBuilder.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationRequest$CreateInvitationRequestBuilder.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationRequest.class b/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationRequest.class
index 0848b5a..b4ddd0d 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationRequest.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationRequest.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationResponse$CreateInvitationResponseBuilder.class b/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationResponse$CreateInvitationResponseBuilder.class
index b1d928b..e073427 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationResponse$CreateInvitationResponseBuilder.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationResponse$CreateInvitationResponseBuilder.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationResponse.class b/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationResponse.class
index aa41394..649ec98 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationResponse.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/CreateInvitationResponse.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/InvitationInfoResponse$InvitationInfoResponseBuilder.class b/auth-service/target/classes/com/flowforge/auth_service/dto/InvitationInfoResponse$InvitationInfoResponseBuilder.class
index caa368e..dd7a3f7 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/InvitationInfoResponse$InvitationInfoResponseBuilder.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/InvitationInfoResponse$InvitationInfoResponseBuilder.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/InvitationInfoResponse.class b/auth-service/target/classes/com/flowforge/auth_service/dto/InvitationInfoResponse.class
index 6c20076..af4eb08 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/InvitationInfoResponse.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/InvitationInfoResponse.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/LoginRequest$LoginRequestBuilder.class b/auth-service/target/classes/com/flowforge/auth_service/dto/LoginRequest$LoginRequestBuilder.class
index 787dac4..91ccc2e 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/LoginRequest$LoginRequestBuilder.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/LoginRequest$LoginRequestBuilder.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/LoginRequest.class b/auth-service/target/classes/com/flowforge/auth_service/dto/LoginRequest.class
index 3f15216..2d35db2 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/LoginRequest.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/LoginRequest.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/RefreshTokenRequest$RefreshTokenRequestBuilder.class b/auth-service/target/classes/com/flowforge/auth_service/dto/RefreshTokenRequest$RefreshTokenRequestBuilder.class
index 301c710..e1e8ffb 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/RefreshTokenRequest$RefreshTokenRequestBuilder.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/RefreshTokenRequest$RefreshTokenRequestBuilder.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/RefreshTokenRequest.class b/auth-service/target/classes/com/flowforge/auth_service/dto/RefreshTokenRequest.class
index fd060e1..ef6a334 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/RefreshTokenRequest.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/RefreshTokenRequest.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterOrgRequest$RegisterOrgRequestBuilder.class b/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterOrgRequest$RegisterOrgRequestBuilder.class
index f2d287c..baa22e3 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterOrgRequest$RegisterOrgRequestBuilder.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterOrgRequest$RegisterOrgRequestBuilder.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterOrgRequest.class b/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterOrgRequest.class
index 24f3874..a062319 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterOrgRequest.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterOrgRequest.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterWithInviteRequest$RegisterWithInviteRequestBuilder.class b/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterWithInviteRequest$RegisterWithInviteRequestBuilder.class
index 442df37..000eeb7 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterWithInviteRequest$RegisterWithInviteRequestBuilder.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterWithInviteRequest$RegisterWithInviteRequestBuilder.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterWithInviteRequest.class b/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterWithInviteRequest.class
index 9d3f527..b348c61 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterWithInviteRequest.class and b/auth-service/target/classes/com/flowforge/auth_service/dto/RegisterWithInviteRequest.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/enums/InvitationStatus.class b/auth-service/target/classes/com/flowforge/auth_service/enums/InvitationStatus.class
index a359820..2412cf1 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/enums/InvitationStatus.class and b/auth-service/target/classes/com/flowforge/auth_service/enums/InvitationStatus.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/enums/Role.class b/auth-service/target/classes/com/flowforge/auth_service/enums/Role.class
index 2f43585..b3faea8 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/enums/Role.class and b/auth-service/target/classes/com/flowforge/auth_service/enums/Role.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/AuthServiceException.class b/auth-service/target/classes/com/flowforge/auth_service/exception/AuthServiceException.class
index 0ba6754..e7c687e 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/exception/AuthServiceException.class and b/auth-service/target/classes/com/flowforge/auth_service/exception/AuthServiceException.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/EmailAlreadyExistsException.class b/auth-service/target/classes/com/flowforge/auth_service/exception/EmailAlreadyExistsException.class
index d133679..d28d435 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/exception/EmailAlreadyExistsException.class and b/auth-service/target/classes/com/flowforge/auth_service/exception/EmailAlreadyExistsException.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/EmailMismatchException.class b/auth-service/target/classes/com/flowforge/auth_service/exception/EmailMismatchException.class
index e74d2f0..53032ee 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/exception/EmailMismatchException.class and b/auth-service/target/classes/com/flowforge/auth_service/exception/EmailMismatchException.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/GlobalExceptionHandler.class b/auth-service/target/classes/com/flowforge/auth_service/exception/GlobalExceptionHandler.class
index 5ebf409..a3ffe79 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/exception/GlobalExceptionHandler.class and b/auth-service/target/classes/com/flowforge/auth_service/exception/GlobalExceptionHandler.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/InvalidCredentialsException.class b/auth-service/target/classes/com/flowforge/auth_service/exception/InvalidCredentialsException.class
index fc555ec..6a26ebf 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/exception/InvalidCredentialsException.class and b/auth-service/target/classes/com/flowforge/auth_service/exception/InvalidCredentialsException.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/InvalidInviteTokenException.class b/auth-service/target/classes/com/flowforge/auth_service/exception/InvalidInviteTokenException.class
index 8c49bbc..c1bdb5a 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/exception/InvalidInviteTokenException.class and b/auth-service/target/classes/com/flowforge/auth_service/exception/InvalidInviteTokenException.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/InvalidRefreshTokenException.class b/auth-service/target/classes/com/flowforge/auth_service/exception/InvalidRefreshTokenException.class
index cbfef9c..c5fe40f 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/exception/InvalidRefreshTokenException.class and b/auth-service/target/classes/com/flowforge/auth_service/exception/InvalidRefreshTokenException.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/InvitationAlreadyUsedException.class b/auth-service/target/classes/com/flowforge/auth_service/exception/InvitationAlreadyUsedException.class
index f684a42..b4f4fc9 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/exception/InvitationAlreadyUsedException.class and b/auth-service/target/classes/com/flowforge/auth_service/exception/InvitationAlreadyUsedException.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/InvitationEmailSentFailedException.class b/auth-service/target/classes/com/flowforge/auth_service/exception/InvitationEmailSentFailedException.class
new file mode 100644
index 0000000..4273d54
Binary files /dev/null and b/auth-service/target/classes/com/flowforge/auth_service/exception/InvitationEmailSentFailedException.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/InvitationExpiredException.class b/auth-service/target/classes/com/flowforge/auth_service/exception/InvitationExpiredException.class
index 0d799df..738a066 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/exception/InvitationExpiredException.class and b/auth-service/target/classes/com/flowforge/auth_service/exception/InvitationExpiredException.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/OrganizationAlreadyExistsException.class b/auth-service/target/classes/com/flowforge/auth_service/exception/OrganizationAlreadyExistsException.class
index aec388d..d467c1e 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/exception/OrganizationAlreadyExistsException.class and b/auth-service/target/classes/com/flowforge/auth_service/exception/OrganizationAlreadyExistsException.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/OrganizationNotFoundException.class b/auth-service/target/classes/com/flowforge/auth_service/exception/OrganizationNotFoundException.class
index 8c39a40..d0ccd87 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/exception/OrganizationNotFoundException.class and b/auth-service/target/classes/com/flowforge/auth_service/exception/OrganizationNotFoundException.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/exception/UserNotFoundException.class b/auth-service/target/classes/com/flowforge/auth_service/exception/UserNotFoundException.class
index 49c8943..771c52e 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/exception/UserNotFoundException.class and b/auth-service/target/classes/com/flowforge/auth_service/exception/UserNotFoundException.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/facade/AuthenticationFacade.class b/auth-service/target/classes/com/flowforge/auth_service/facade/AuthenticationFacade.class
index 30f934e..339a5b4 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/facade/AuthenticationFacade.class and b/auth-service/target/classes/com/flowforge/auth_service/facade/AuthenticationFacade.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/facade/InvitationFacade.class b/auth-service/target/classes/com/flowforge/auth_service/facade/InvitationFacade.class
index 7b1dd2b..b14924b 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/facade/InvitationFacade.class and b/auth-service/target/classes/com/flowforge/auth_service/facade/InvitationFacade.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/mapper/InvitationMapper.class b/auth-service/target/classes/com/flowforge/auth_service/mapper/InvitationMapper.class
index d0a7025..05dc79f 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/mapper/InvitationMapper.class and b/auth-service/target/classes/com/flowforge/auth_service/mapper/InvitationMapper.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/mapper/OrganizationMapper.class b/auth-service/target/classes/com/flowforge/auth_service/mapper/OrganizationMapper.class
index efff5ec..37c5d7a 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/mapper/OrganizationMapper.class and b/auth-service/target/classes/com/flowforge/auth_service/mapper/OrganizationMapper.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/mapper/UserMapper.class b/auth-service/target/classes/com/flowforge/auth_service/mapper/UserMapper.class
index e9e6a88..eec3098 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/mapper/UserMapper.class and b/auth-service/target/classes/com/flowforge/auth_service/mapper/UserMapper.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/model/Invitation$InvitationBuilder.class b/auth-service/target/classes/com/flowforge/auth_service/model/Invitation$InvitationBuilder.class
index 1043ae8..63b9f7c 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/model/Invitation$InvitationBuilder.class and b/auth-service/target/classes/com/flowforge/auth_service/model/Invitation$InvitationBuilder.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/model/Invitation.class b/auth-service/target/classes/com/flowforge/auth_service/model/Invitation.class
index 02f82de..0c05dfe 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/model/Invitation.class and b/auth-service/target/classes/com/flowforge/auth_service/model/Invitation.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/model/Organization.class b/auth-service/target/classes/com/flowforge/auth_service/model/Organization.class
index e1e66e4..b2ff0e3 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/model/Organization.class and b/auth-service/target/classes/com/flowforge/auth_service/model/Organization.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/model/User$UserBuilder.class b/auth-service/target/classes/com/flowforge/auth_service/model/User$UserBuilder.class
index 380aace..4ece66c 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/model/User$UserBuilder.class and b/auth-service/target/classes/com/flowforge/auth_service/model/User$UserBuilder.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/model/User.class b/auth-service/target/classes/com/flowforge/auth_service/model/User.class
index b08d5aa..e6ba792 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/model/User.class and b/auth-service/target/classes/com/flowforge/auth_service/model/User.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/repository/InvitationRepository.class b/auth-service/target/classes/com/flowforge/auth_service/repository/InvitationRepository.class
index 6d5d093..4bb241c 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/repository/InvitationRepository.class and b/auth-service/target/classes/com/flowforge/auth_service/repository/InvitationRepository.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/repository/OrganizationRepository.class b/auth-service/target/classes/com/flowforge/auth_service/repository/OrganizationRepository.class
index 2e3eaf4..f935145 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/repository/OrganizationRepository.class and b/auth-service/target/classes/com/flowforge/auth_service/repository/OrganizationRepository.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/repository/UserRepository.class b/auth-service/target/classes/com/flowforge/auth_service/repository/UserRepository.class
index 12d3ab4..8b60f01 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/repository/UserRepository.class and b/auth-service/target/classes/com/flowforge/auth_service/repository/UserRepository.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/security/JwtFilter.class b/auth-service/target/classes/com/flowforge/auth_service/security/JwtFilter.class
index 099691c..b769099 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/security/JwtFilter.class and b/auth-service/target/classes/com/flowforge/auth_service/security/JwtFilter.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/security/JwtService.class b/auth-service/target/classes/com/flowforge/auth_service/security/JwtService.class
index e138c63..b98ee2d 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/security/JwtService.class and b/auth-service/target/classes/com/flowforge/auth_service/security/JwtService.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/security/SecurityConfig.class b/auth-service/target/classes/com/flowforge/auth_service/security/SecurityConfig.class
index d76020e..b834079 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/security/SecurityConfig.class and b/auth-service/target/classes/com/flowforge/auth_service/security/SecurityConfig.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/security/UserPrincipal.class b/auth-service/target/classes/com/flowforge/auth_service/security/UserPrincipal.class
index 726b435..c410565 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/security/UserPrincipal.class and b/auth-service/target/classes/com/flowforge/auth_service/security/UserPrincipal.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/service/AuthenticationService.class b/auth-service/target/classes/com/flowforge/auth_service/service/AuthenticationService.class
index 893b5f9..801e1da 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/service/AuthenticationService.class and b/auth-service/target/classes/com/flowforge/auth_service/service/AuthenticationService.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/service/InvitationService.class b/auth-service/target/classes/com/flowforge/auth_service/service/InvitationService.class
index 1ba413d..47b7620 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/service/InvitationService.class and b/auth-service/target/classes/com/flowforge/auth_service/service/InvitationService.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/service/MailService.class b/auth-service/target/classes/com/flowforge/auth_service/service/MailService.class
index 1023ba1..4d65199 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/service/MailService.class and b/auth-service/target/classes/com/flowforge/auth_service/service/MailService.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/service/OrganizationService.class b/auth-service/target/classes/com/flowforge/auth_service/service/OrganizationService.class
index 076640a..fffac22 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/service/OrganizationService.class and b/auth-service/target/classes/com/flowforge/auth_service/service/OrganizationService.class differ
diff --git a/auth-service/target/classes/com/flowforge/auth_service/service/UserService.class b/auth-service/target/classes/com/flowforge/auth_service/service/UserService.class
index 711a902..d6ea394 100644
Binary files a/auth-service/target/classes/com/flowforge/auth_service/service/UserService.class and b/auth-service/target/classes/com/flowforge/auth_service/service/UserService.class differ
diff --git a/auth-service/target/maven-archiver/pom.properties b/auth-service/target/maven-archiver/pom.properties
deleted file mode 100644
index 147b25c..0000000
--- a/auth-service/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-artifactId=auth-service
-groupId=com.flowforge
-version=0.0.1-SNAPSHOT
diff --git a/auth-service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/auth-service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 1d33855..120ba2e 100644
--- a/auth-service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/auth-service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -14,6 +14,7 @@ com\flowforge\auth_service\dto\RegisterWithInviteRequest.class
 com\flowforge\auth_service\facade\InvitationFacade.class
 com\flowforge\auth_service\model\User.class
 com\flowforge\auth_service\dto\CreateInvitationResponse$CreateInvitationResponseBuilder.class
+com\flowforge\auth_service\exception\InvitationEmailSentFailedException.class
 com\flowforge\auth_service\config\SwaggerConfig.class
 com\flowforge\auth_service\security\JwtService.class
 com\flowforge\auth_service\security\UserPrincipal.class
@@ -21,6 +22,7 @@ com\flowforge\auth_service\mapper\UserMapper.class
 com\flowforge\auth_service\model\Organization.class
 com\flowforge\auth_service\controller\InvitationController.class
 com\flowforge\auth_service\dto\RefreshTokenRequest$RefreshTokenRequestBuilder.class
+com\flowforge\auth_service\service\AuthenticationService.class
 com\flowforge\auth_service\dto\CreateInvitationRequest$CreateInvitationRequestBuilder.class
 com\flowforge\auth_service\AuthServiceApplication.class
 com\flowforge\auth_service\service\UserService.class
diff --git a/auth-service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/auth-service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 16c1a25..5454cac 100644
--- a/auth-service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/auth-service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -22,6 +22,7 @@ C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowfor
 C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\InvalidInviteTokenException.java
 C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\InvalidRefreshTokenException.java
 C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\InvitationAlreadyUsedException.java
+C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\InvitationEmailSentFailedException.java
 C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\InvitationExpiredException.java
 C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\OrganizationAlreadyExistsException.java
 C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\OrganizationNotFoundException.java
@@ -41,6 +42,7 @@ C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowfor
 C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\security\JwtService.java
 C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\security\SecurityConfig.java
 C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\security\UserPrincipal.java
+C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\service\AuthenticationService.java
 C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\service\InvitationService.java
 C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\service\MailService.java
 C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\service\OrganizationService.java
diff --git a/auth-service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/auth-service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
deleted file mode 100644
index aa7c809..0000000
--- a/auth-service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ /dev/null
@@ -1 +0,0 @@
-com\flowforge\auth_service\AuthServiceApplicationTests.class
diff --git a/auth-service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/auth-service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index ccad611..0000000
--- a/auth-service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ /dev/null
@@ -1 +0,0 @@
-C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\test\java\com\flowforge\auth_service\AuthServiceApplicationTests.java
diff --git a/auth-service/target/test-classes/com/flowforge/auth_service/AuthServiceApplicationTests.class b/auth-service/target/test-classes/com/flowforge/auth_service/AuthServiceApplicationTests.class
deleted file mode 100644
index f6df70c..0000000
Binary files a/auth-service/target/test-classes/com/flowforge/auth_service/AuthServiceApplicationTests.class and /dev/null differ