change password functionality, flash message moved down a bit
merge