Apple CEO Tim Cook has said iCloud will add extra security features following the celebrity nude photo leak.
Although he reiterated that the celebrities' usernames and passwords were not leaked from Apple's servers.
Hackers gained access to celebrities' iCloud accounts by correctly answering their security questions to obtain their passwords.
To combat this in future, Cook told The Wall Street Journal that Apple will alert users via email and push notifications when someone tries to change their account password, restore iCloud data to a new device, or when a device logs in for the first time.
Currently, users are only sent an email when someone tries to change their password or log in from an unknown Apple device.
The new security measures will come in in the next two weeks. They will allow users to change their passwords straightaway, or alert Apple's security team.
Though Cook added that knowledge is the best protection against these kinds of hacks.
"When I step back from this terrible scenario that happened and say what more could we have done, I think about the awareness piece," he said. "I think we have a responsibility to ratchet that up. That's not really an engineering thing."
Celebrities affected by the leak include Jennifer Lawrence, Rihanna, Kim Kardashian, and Kate Upton.
Apple will unveil the iPhone 6 on Tuesday at 6pm UK time. We might hear more about the new security measures then. We'll bring you all the news as it happens, so stay tuned.