diff --git a/autostart.lua b/autostart.lua
index fb96692..97c9b17 100644
--- a/autostart.lua
+++ b/autostart.lua
@@ -1,10 +1,11 @@
 os.execute ("numlockx on &")
 os.execute ("xsetroot -cursor_name left_ptr &")
-os.execute ("xscreensaver -no-splash &")
-os.execute ("pidgin &")
+os.execute ("pgrep xscreensaver || xscreensaver -no-splash &")
+os.execute ("pgrep pidgin || pidgin &")
 os.execute ("pgrep stardict || stardict &")
 os.execute ("pgrep urxvt || urxvt &")
 os.execute ("pgrep firefox || (firefox || firefox-bin) &")
+os.execute ("pgrep thunderbird || thunderbird &")
 os.execute ("pgrep liferea || liferea &")
 os.execute ("smbnetfs "..os.getenv("HOME").."/smb")
 os.execute (os.getenv("HOME").."/.config/awesome/set_wall.sh "..os.getenv("HOME").."/wallpapers/")