Improve station registering a little bit

Change-Id: I49babd95bb8b11593ce585158aeee3fd20bf1fee
(cherry picked from commit a3d6ff5079a3045f87854feead3916b713c7dcc0)