emergency bugfix

Earlier commit killed new user forward
merge from upstream