fixed user handling and new kirby version