Fix registration and pw rest redirect (#2333)

Fix registration and pw rest redirect (#2333) #457