replaced a couple of changes squashed by the last merge, fixed a bug in
login from login warning dialog