Fixed Password / Changes to code