diff --git a/application/src/main/java/org/thingsboard/server/controller/AuthController.java b/application/src/main/java/org/thingsboard/server/controller/AuthController.java
index d06f2bed9d..fe29b083d6 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AuthController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AuthController.java
@@ -107,7 +107,7 @@ public class AuthController extends BaseController {
             try {
                 URI location = new URI(createPasswordURI + "?activateToken=" + activateToken);
                 headers.setLocation(location);
-                responseStatus = HttpStatus.PERMANENT_REDIRECT;
+                responseStatus = HttpStatus.SEE_OTHER;
             } catch (URISyntaxException e) {
                 log.error("Unable to create URI with address [{}]", createPasswordURI);
                 responseStatus = HttpStatus.BAD_REQUEST;
@@ -146,7 +146,7 @@ public class AuthController extends BaseController {
             try {
                 URI location = new URI(resetPasswordURI + "?resetToken=" + resetToken);
                 headers.setLocation(location);
-                responseStatus = HttpStatus.PERMANENT_REDIRECT;
+                responseStatus = HttpStatus.SEE_OTHER;
             } catch (URISyntaxException e) {
                 log.error("Unable to create URI with address [{}]", resetPasswordURI);
                 responseStatus = HttpStatus.BAD_REQUEST;
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
index 435f9a64f3..b85f159b21 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
@@ -200,7 +200,7 @@ public abstract class AbstractControllerTest {
         User savedUser = doPost("/api/user", user, User.class);
         logout();
         doGet("/api/noauth/activate?activateToken={activateToken}", TestMailService.currentActivateToken)
-        .andExpect(status().isPermanentRedirect())
+        .andExpect(status().isSeeOther())
         .andExpect(header().string(HttpHeaders.LOCATION, "/login/createPassword?activateToken=" + TestMailService.currentActivateToken));
         JsonNode tokenInfo = readResponse(doPost("/api/noauth/activate", "activateToken", TestMailService.currentActivateToken, "password", password).andExpect(status().isOk()), JsonNode.class);
         validateAndSetJwtToken(tokenInfo, user.getEmail());
diff --git a/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
index 4fafd617d4..d57871bba9 100644
--- a/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
@@ -70,7 +70,7 @@ public class UserControllerTest extends AbstractControllerTest {
         
         logout();
         doGet("/api/noauth/activate?activateToken={activateToken}", TestMailService.currentActivateToken)
-        .andExpect(status().isPermanentRedirect())
+        .andExpect(status().isSeeOther())
         .andExpect(header().string(HttpHeaders.LOCATION, "/login/createPassword?activateToken=" + TestMailService.currentActivateToken));
 
         JsonNode tokenInfo = readResponse(doPost("/api/noauth/activate", "activateToken", TestMailService.currentActivateToken, "password", "testPassword").andExpect(status().isOk()), JsonNode.class);
@@ -120,7 +120,7 @@ public class UserControllerTest extends AbstractControllerTest {
         doPost("/api/noauth/resetPasswordByEmail", "email", email)
         .andExpect(status().isOk());
         doGet("/api/noauth/resetPassword?resetToken={resetToken}", TestMailService.currentResetPasswordToken)
-        .andExpect(status().isPermanentRedirect())
+        .andExpect(status().isSeeOther())
         .andExpect(header().string(HttpHeaders.LOCATION, "/login/resetPassword?resetToken=" + TestMailService.currentResetPasswordToken));
         
         JsonNode tokenInfo = readResponse(doPost("/api/noauth/resetPassword", "resetToken", TestMailService.currentResetPasswordToken, "password", "testPassword2").andExpect(status().isOk()), JsonNode.class);