Weight of fields not working properly for email field for anonymous users

Title says it all. Below is the code to fix this issue. Basically the issue boils down to EMF not pulling the email fields weight from the database and hence not ordering it correctly.

// emf.form.inc:84 before
        if (in_array($field->key, array('mail'))) continue;

// after
        if (in_array($field->key, array('mail'))) 
        {
        	$form['fields']['mail']['#weight'] = $field->weight;
        	continue;
    	}