back port login images fixes to free version