Merge pull request #376 from leider/master

search the wiki
Fix for #377

wrong redirect after login