             password : ''  # more secure...
 
     save_editing: ->
+        if @state.password.length < 6
+            @setState
+                state : 'edit'
+                error : 'Password must be at least 6 characters long.'
+            return
         @setState
             state : 'saving'
         webapp_client.change_email

        if @props.email_address
            return "Change email address"
        else
            return "Set email address"

    render: ->
        <LabeledRow label='Email address'  style={if @props.disabled then {color:"#666"}}>

                        strength     : 0

    is_submittable: ->
        return @state.new_password.length >= 6 and @state.new_password and @state.new_password != @state.old_password and (not @state.zxcvbn? or @state.zxcvbn?.score > 0)

    change_button: ->
        if @is_submittable()
