I'm more concerned about having them get a rifle when one of the riflemen die. As it is, when a rifleman dies, then you only have 3 riflemen and 4 unarmed. If all the riflemen die, then you just have a squad without weapons.
I think the rifle should go to the next person when the owner dies, just like larger weapons (LMG42, Panzerschreck, etc) get moved to another squad member when the user dies.