Revert "screen- fix adminscreen from crash"

This reverts commit 5fc105d1e19d4879c986fa436eff17a2a5d97a5d.
Revert "Revert "screen- fix adminscreen from crash""

This reverts commit 41bf5d0b157e399ac80c2050267cfe1aad77fcf0.