In the wake of incidents like last fall’s celebrity nude photo hack, Apple is now taking big steps to make all of its services more secure. Indeed, according to a report from Business Insider, both iMessage and FaceTime are getting two-step verification updates, as a means of staving off would-be hackers.

Naturally, two-step authentication will make Apple’s messaging services considerably more secure. When a user attempts to login to their iMessage or FaceTime accounts, they will be asked to enter their standard password. If and when the correct password has been entered, Apple will automatically send a text message to the user’s phone, containing a special security code. The code will be needed to authenticate the login and access the account.

In other words, a hacker would need both a user’s password and the user’s phone in order to break into an iMessage or FaceTime account. Otherwise, the user would be notified, via their device, that someone was trying to access their account remotely. They would then be able change their passwords, or report the attempted hack to Apple.

While the two-step authentication process will be applied specifically to the iMessage and FaceTime services, it will go a long way toward making iCloud more secure. When hackers leaked celebrity photos last fall, they did so by taking advantage of Apple’s lax security measures to break into iCloud accounts. They were then able to access the photos and other information stored on celebrities’ phones.

Part of the issue in the iCloud leak was that none of Apple’s services were properly protected with strong password authentication. Previously, Apple used the “security question” system with its passwords, asking users personal questions – like the name of a first crush or a street of residence from childhood – to authenticate that users were indeed who they claimed to be.

The issue with security questions, though, is that the answers can be guessed – especially when it comes to celebrities, whose entire lives are essentially public record these days. Last year, hackers were able to guess the answers to security questions to gain access to celebrity iCloud accounts. From there, they had free reign to view, download, and leak extremely intimate photographs.

By scrapping the security question system, and implementing two-step verification, Apple will be able to protect user accounts and information with much more consistency and assuredness.