fixes #42
fixes #70
updated: register & login forms 1/2 of issue 69