diff --git a/bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserLoginServiceImpl.java b/bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserLoginServiceImpl.java index 0b8864187a41d746591006cc247494ddfd0445a9..b88e630c78e4557ef888b945534aab56338e7f84 100644 --- a/bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserLoginServiceImpl.java +++ b/bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserLoginServiceImpl.java @@ -524,6 +524,13 @@ public class UserLoginServiceImpl implements UserLoginService, Serializable { */ registry = registryDao.findByServiceAndUserAndStatus(service, user, RegistryStatus.LOST_ACCESS); } + + if (registry == null) { + /* + * Also check for On_hold registries. They should also be allowed to be rechecked. + */ + registry = registryDao.findByServiceAndUserAndStatus(service, user, RegistryStatus.ON_HOLD); + } return registry; } diff --git a/bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserUpdateServiceImpl.java b/bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserUpdateServiceImpl.java index e9ca6dfba89be16907696f8f5b947aee03701bf7..8ad1a3479440346a8f44e6a5e0ed7f034cc38da9 100644 --- a/bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserUpdateServiceImpl.java +++ b/bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/UserUpdateServiceImpl.java @@ -242,6 +242,13 @@ public class UserUpdateServiceImpl implements UserUpdateService, Serializable { */ registry = registryDao.findByServiceAndUserAndStatus(service, user, RegistryStatus.LOST_ACCESS); } + + if (registry == null) { + /* + * Also check for On_hold registries. They should also be allowed to be rechecked. + */ + registry = registryDao.findByServiceAndUserAndStatus(service, user, RegistryStatus.ON_HOLD); + } return registry; }