AID-599: Redirect user back to URL when doing a POST

:+1: 

Would you like a refactor session with either me or @martinaa?