Merge with Fabian

Now there is a problem with login in with password, that is the next thing to fix. but it could be good for Fabian to see the integrated code.