added password functionality
merged