fixing issue #26

@cadecairos can you please look at what we're doing here with Login and make sure it's OK?