Changed code so that passwords need not be stored