Added password dialog
Fixed conflicts