Index: channels/chan_agent.c
===================================================================
--- channels/chan_agent.c       (revision 37175)
+++ channels/chan_agent.c       (working copy)
@@ -771,14 +771,16 @@
                        ast_channel_lock(p->chan);
                        ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT);
                        ast_channel_unlock(p->chan);
-               } else {
+               } else if (p->loginstart) {
                        ast_channel_lock(p->chan);
                        ast_moh_start(p->chan, p->moh);
                        ast_channel_unlock(p->chan);
                }
        }
        ast_mutex_unlock(&p->lock);
-       ast_device_state_changed("Agent/%s", p->agent);
+       /* The state hasn't changed if they aren't logged in anymore */
+       if (p->loginstart)
+               ast_device_state_changed("Agent/%s", p->agent);

        if (p->pending) {
                AST_LIST_LOCK(&agents);