Added some validation (hacky). User login now required