Fix password reset
Merge branch 'bs3' of https://github.com/cirope/mawidabp into bs3