diff --git a/src/main/java/net/gepafin/tendermanagement/config/SamlSuccessHandler.java b/src/main/java/net/gepafin/tendermanagement/config/SamlSuccessHandler.java
index 1ef52f87..32d07a8f 100644
--- a/src/main/java/net/gepafin/tendermanagement/config/SamlSuccessHandler.java
+++ b/src/main/java/net/gepafin/tendermanagement/config/SamlSuccessHandler.java
@@ -60,16 +60,19 @@ public class SamlSuccessHandler implements AuthenticationSuccessHandler {
 			samlResponseLogEntity.setAuthenticationObject(userAttributesJson);
 			samlResponseLogEntity.setToken(token);
 			samlResponseLogRepository.save(samlResponseLogEntity);
+			
+			String redirectUrl = feBaseUrl;
 
-			// Successful login logic
 			logger.info("SAML login successful for user: " + principal.getName());
 			String cf = userAttributes.get("CodiceFiscale").get(0).toString();
 			UserEntity userEntity = userRepository.findByCodiceFiscale(cf).orElse(null);
 			if (userEntity == null) {
-				response.sendRedirect(feBaseUrl + "/registration?temp_token=" + token);
+				redirectUrl += "/registration?temp_token=" + token;
 			} else {
-				response.sendRedirect(feBaseUrl + "/login?temp_token=" + token);
+				redirectUrl += "/login?temp_token=" + token;
 			}
+			response.sendRedirect(redirectUrl);
+			logger.info("SAML redirect Url: " + redirectUrl);
 		} catch (Exception e) {
 			logger.error("Error processing SAML success handler", e);
 		}