! fix 1336, wrong txt string used in notifications

Signed-off-by: Spuds <spuds@spudsdesign.com>
! just some template and comment cleanup since I was on a bug hunt

Signed-off-by: Spuds <spuds@spudsdesign.com>
! When submitting a admin login form, the validateToken was
checked twice when an incorrect password was entered, resulting
in a token failed instead of a login failed.

Signed-off-by: Spuds <spuds@spudsdesign.com>
Merge pull request #1337 from Spuds/b2withsauce

B2 Fixes